diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-27 06:10:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-27 06:10:25 +0000 |
| commit | fea7950793598593b47accf4d7949deb295b1318 (patch) | |
| tree | dae8f9cb8c211fd01bc3602f4900b77dccf5b386 /devel | |
| parent | 862ad53c1cd7ad234064e9be0453eba137c7e830 (diff) | |
| download | pkgsrc-fea7950793598593b47accf4d7949deb295b1318.tar.gz | |
Protect against possibly empty BUILDLINK_LIBNAME.* variables when
defining BUILDLINK_LDADD.* by using a substitution instead of directly
prepending "-l".
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ncurses/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/pdcurses/buildlink3.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index 0b79c893f24..0b80496084f 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2008/02/27 04:47:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2008/02/27 06:10:25 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ @@ -16,7 +16,7 @@ BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1 BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1 BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses BUILDLINK_LIBNAME.ncurses= ncurses -BUILDLINK_LDADD.ncurses?= -l${BUILDLINK_LIBNAME.ncurses} +BUILDLINK_LDADD.ncurses?= ${BUILDLINK_LIBNAME.ncurses:S/^/-l/} # Many packages expect the ncurses headers and libraries to be usable as # <curses.h> and -lcurses. diff --git a/devel/pdcurses/buildlink3.mk b/devel/pdcurses/buildlink3.mk index c5ee527cc76..177d05bc5e5 100644 --- a/devel/pdcurses/buildlink3.mk +++ b/devel/pdcurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2008/02/27 04:47:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2008/02/27 06:10:25 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PDCURSES_BUILDLINK3_MK:= ${PDCURSES_BUILDLINK3_MK}+ @@ -15,7 +15,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdcurses BUILDLINK_API_DEPENDS.pdcurses+= pdcurses>=3.3 BUILDLINK_PKGSRCDIR.pdcurses?= ../../devel/pdcurses BUILDLINK_LIBNAME.pdcurses= XCurses -BUILDLINK_LDADD.pdcurses?= -l${BUILDLINK_LIBNAME.pdcurses} +BUILDLINK_LDADD.pdcurses?= ${BUILDLINK_LIBNAME.pdcurses:S/^/-l/} # _PKG_USE_CURSES is defined by curses.buildlink3.mk to indicate that # the headers and libraries should be usable as <curses.h> and -lcurses. |