diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-27 06:14:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-27 06:14:23 +0000 |
| commit | 70c7f36d9943ac736f19824fe03a14c5a3427a6d (patch) | |
| tree | b43b2ecc49659779b4916d89c5a163d2512cd711 | |
| parent | 02629b7349f729b562b5f21762c64706c0f91a34 (diff) | |
| download | pkgsrc-70c7f36d9943ac736f19824fe03a14c5a3427a6d.tar.gz | |
Define BUILTIN_LIBNAME.* outside of the CHECK_BUILTIN.*-protected
section to be the name of the built-in library if USE_BUILTIN.* is
"yes". These variables can be used in other builtin.mk files.
| -rw-r--r-- | devel/ncurses/builtin.mk | 34 | ||||
| -rw-r--r-- | mk/curses.builtin.mk | 15 |
2 files changed, 30 insertions, 19 deletions
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index 63d23ec0924..2a543cea722 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.17 2008/02/27 04:47:02 jlam Exp $ +# $NetBSD: builtin.mk,v 1.18 2008/02/27 06:14:23 jlam Exp $ BUILTIN_PKG:= ncurses @@ -100,6 +100,25 @@ USE_BUILTIN.ncurses= no . endif .endif +# Define BUILTIN_LIBNAME.ncurses to be the built-in ncurses library +# only if we're using the built-in ncurses. +# +.if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \ + !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) +BUILTIN_LIBNAME.ncurses= curses +. endif +# +# On Interix, there is a libncurses.a and a libcurses.so but strangely, +# no libncurses.so. We want to link against the shared library, so +# turn "-lncurses" into "-lcurses". +# +. if (${OPSYS} == "Interix") && \ + !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) +BUILTIN_LIBNAME.ncurses= curses +. endif +.endif + ### ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. @@ -109,19 +128,6 @@ CHECK_BUILTIN.ncurses?= no BUILDLINK_TRANSFORM+= l:ncurses:${BUILDLINK_LIBNAME.ncurses} . if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) -. if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \ - !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) -BUILDLINK_LIBNAME.ncurses= curses -. endif -# -# On Interix, there is a libncurses.a and a libcurses.so but strangely, -# no libncurses.so. We want to link against the shared library, so -# turn "-lncurses" into "-lcurses". -# -. if (${OPSYS} == "Interix") && \ - !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) -BUILDLINK_LIBNAME.ncurses= curses -. endif BUILDLINK_TARGETS+= buildlink-curses-ncurses-h BUILDLINK_TARGETS+= buildlink-ncurses-extra-includes . endif diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk index e35b4ee4da3..e1e812ebc2a 100644 --- a/mk/curses.builtin.mk +++ b/mk/curses.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.builtin.mk,v 1.3 2008/02/27 04:47:02 jlam Exp $ +# $NetBSD: curses.builtin.mk,v 1.4 2008/02/27 06:14:23 jlam Exp $ BUILTIN_PKG:= curses @@ -46,6 +46,15 @@ USE_BUILTIN.curses!= \ .endif MAKEVARS+= USE_BUILTIN.curses +# Define BUILTIN_LIBNAME.curses to be the built-in curses library only if +# we're using the built-in curses. +# +.if !empty(USE_BUILTIN.curses:M[yY][eE][sS]) +. if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) +BUILTIN_LIBNAME.curses= curses +. endif +.endif + ### ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. @@ -57,10 +66,6 @@ CHECK_BUILTIN.curses?= no . if exists(${H_CURSES}) BUILDLINK_INCDIRS.curses?= ${H_CURSES:H:S/^${BUILDLINK_PREFIX.curses}\///} . endif -. if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) -BUILDLINK_LIBNAME.curses= curses -BUILDLINK_LDADD.curses?= -l${BUILDLINK_LIBNAME.curses} -. endif . endif .endif # CHECK_BUILTIN.curses |