diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-29 16:14:09 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-29 16:14:09 +0000 |
| commit | 84028d8f68627f26f665a8d5c5ce929a76fc1921 (patch) | |
| tree | c988d6360dd81b795f47e8c03a1749e1d6096f39 /devel | |
| parent | 4d8b0dc9188bbb8b40c2b7c3ae82b69fc46b6ca6 (diff) | |
| download | pkgsrc-84028d8f68627f26f665a8d5c5ce929a76fc1921.tar.gz | |
+ Always ensure that BUILTIN_LIBNAME.ncurses is defined (this should have
been the case before, but wasn't due to a missing default vaule.
+ Move the BUILDLINK_TRANSFORM remapping of -lncurses into the section
which only applies if we're using the built-in ncurses, and map it to
-l${BUILTIN_LIBNAME.ncurses}.
This should fix the issue reported for Mac OS X where "-lncurses" was
being mapped to nothing by the wrapper scripts.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ncurses/builtin.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index f35cf3f876f..b4dae72e38f 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.21 2008/02/29 16:04:55 tron Exp $ +# $NetBSD: builtin.mk,v 1.22 2008/02/29 16:14:09 jlam Exp $ BUILTIN_PKG:= ncurses @@ -103,6 +103,7 @@ USE_BUILTIN.ncurses= no # Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in # ncurses library. # +BUILTIN_LIBNAME.ncurses= ncurses .if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \ !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) BUILTIN_LIBNAME.ncurses= curses @@ -124,9 +125,9 @@ BUILTIN_LIBNAME.ncurses= curses CHECK_BUILTIN.ncurses?= no .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO]) -BUILDLINK_TRANSFORM+= l:ncurses:${BUILDLINK_LIBNAME.ncurses} . if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) BUILDLINK_LIBNAME.ncurses= ${BUILTIN_LIBNAME.ncurses} +BUILDLINK_TRANSFORM+= l:ncurses:${BUILTIN_LIBNAME.ncurses} BUILDLINK_TARGETS+= buildlink-curses-ncurses-h BUILDLINK_TARGETS+= buildlink-ncurses-extra-includes . endif |