diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-27 04:47:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-27 04:47:02 +0000 |
| commit | f686df4e6c1895ff3eada380075cdc6d8854c01a (patch) | |
| tree | 56928d0e8dbf992555dfd701e1f90d6e512a5196 /devel/ncurses | |
| parent | 8dbadc06accb49d6b11e837958e72aaf205a15bb (diff) | |
| download | pkgsrc-f686df4e6c1895ff3eada380075cdc6d8854c01a.tar.gz | |
+ The termlib.buildlink3.mk file is meant to be included by packages
that need basic termlib functionality, i.e. tgetent(), tgoto(),
tputs(), etc. Together with the termlib.builtin.mk file, they will
use either a built-in termcap library, a built-in X/Open "enhanced"
curses library, or ncurses to provide these functions.
+ Add BUILDLINK_LIBNAME.* definitions to the various curses buildlink3.mk
and builtin.mk files that give the "base" library name of the curses
library, e.g. curses, ncurses, etc. These are used by the termlib
files to set BUILDLINK_LIBNAME.termlib.
Diffstat (limited to 'devel/ncurses')
| -rw-r--r-- | devel/ncurses/buildlink3.mk | 9 | ||||
| -rw-r--r-- | devel/ncurses/builtin.mk | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index 0dce2a298a3..0b79c893f24 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2008/02/26 17:21:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2008/02/27 04:47:02 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ @@ -15,13 +15,14 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncurses BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1 BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1 BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses -BUILDLINK_LDADD.ncurses?= -lncurses +BUILDLINK_LIBNAME.ncurses= ncurses +BUILDLINK_LDADD.ncurses?= -l${BUILDLINK_LIBNAME.ncurses} # Many packages expect the ncurses headers and libraries to be usable as # <curses.h> and -lcurses. # -BUILDLINK_TARGETS+= buildlink-ncurses-curses-h -BUILDLINK_TRANSFORM+= l:curses:ncurses +BUILDLINK_TARGETS+= buildlink-ncurses-curses-h +BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncurses} .PHONY: buildlink-ncurses-curses-h buildlink-ncurses-curses-h: diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index e7e6dce54d7..63d23ec0924 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.16 2008/02/26 17:21:13 jlam Exp $ +# $NetBSD: builtin.mk,v 1.17 2008/02/27 04:47:02 jlam Exp $ BUILTIN_PKG:= ncurses @@ -107,12 +107,11 @@ USE_BUILTIN.ncurses= no CHECK_BUILTIN.ncurses?= no .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO]) -BUILDLINK_LDADD.ncurses= -lncurses +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_LDADD.ncurses= -lcurses -BUILDLINK_TRANSFORM+= l:ncurses:curses +BUILDLINK_LIBNAME.ncurses= curses . endif # # On Interix, there is a libncurses.a and a libcurses.so but strangely, @@ -121,8 +120,7 @@ BUILDLINK_TRANSFORM+= l:ncurses:curses # . if (${OPSYS} == "Interix") && \ !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) -BUILDLINK_LDADD.ncurses= -lcurses -BUILDLINK_TRANSFORM+= l:ncurses:curses +BUILDLINK_LIBNAME.ncurses= curses . endif BUILDLINK_TARGETS+= buildlink-curses-ncurses-h BUILDLINK_TARGETS+= buildlink-ncurses-extra-includes |