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 | 02629b7349f729b562b5f21762c64706c0f91a34 (patch) | |
| tree | dae8f9cb8c211fd01bc3602f4900b77dccf5b386 | |
| parent | f686df4e6c1895ff3eada380075cdc6d8854c01a (diff) | |
| download | pkgsrc-02629b7349f729b562b5f21762c64706c0f91a34.tar.gz | |
Protect against possibly empty BUILDLINK_LIBNAME.* variables when
defining BUILDLINK_LDADD.* by using a substitution instead of directly
prepending "-l".
| -rw-r--r-- | devel/ncurses/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/pdcurses/buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/termlib.buildlink3.mk | 4 |
3 files changed, 6 insertions, 6 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. diff --git a/mk/termlib.buildlink3.mk b/mk/termlib.buildlink3.mk index 352e1512c48..bd9d8a5e073 100644 --- a/mk/termlib.buildlink3.mk +++ b/mk/termlib.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: termlib.buildlink3.mk,v 1.1 2008/02/27 04:47:02 jlam Exp $ +# $NetBSD: termlib.buildlink3.mk,v 1.2 2008/02/27 06:10:25 jlam Exp $ # # This Makefile fragment is meant to be included by packages that require # a basic termlib implementation. @@ -39,7 +39,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntermlib} BUILDLINK_PACKAGES+= termlib BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termlib BUILDLINK_LIBNAME.termlib?= termcap -BUILDLINK_LDADD.termlib?= -l${BUILDLINK_LIBNAME.termlib} +BUILDLINK_LDADD.termlib?= ${BUILDLINK_LIBNAME.termlib:S/^/-l/} BUILDLINK_BUILTIN_MK.termlib= ../../mk/termlib.builtin.mk .elif ${TERMLIB_TYPE} == "curses" . include "../../mk/curses.buildlink3.mk" |