diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-29 19:23:07 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-29 19:23:07 +0000 |
| commit | 1edde7369f9ea875c7704cfb1a546e93f55f0977 (patch) | |
| tree | 18fa2436d3501b0a88d2ed63028fb4677304322d /devel | |
| parent | 0e0478034d3c7715d36c262066341c122a9fc782 (diff) | |
| download | pkgsrc-1edde7369f9ea875c7704cfb1a546e93f55f0977.tar.gz | |
Provide value for BUILDLINK_LDADD.ncursesw that can be used by packages
that need to know how to link against ncursesw.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ncursesw/buildlink3.mk | 5 | ||||
| -rw-r--r-- | devel/ncursesw/builtin.mk | 18 |
2 files changed, 17 insertions, 6 deletions
diff --git a/devel/ncursesw/buildlink3.mk b/devel/ncursesw/buildlink3.mk index 637883a9e63..9e9b0338b69 100644 --- a/devel/ncursesw/buildlink3.mk +++ b/devel/ncursesw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/02/20 17:17:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2008/02/29 19:23:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSESW_BUILDLINK3_MK:=${NCURSESW_BUILDLINK3_MK}+ @@ -15,6 +15,9 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ncursesw BUILDLINK_API_DEPENDS.ncursesw+= ncursesw>=5.5 BUILDLINK_ABI_DEPENDS.ncursesw+= ncursesw>=5.5 BUILDLINK_PKGSRCDIR.ncursesw?= ../../devel/ncursesw + +BUILDLINK_LIBNAME.ncursesw= ncursesw +BUILDLINK_LDADD.ncursesw= ${BUILDLINK_LIBNAME.ncursesw:S/^/-l/:S/^-l$//} .endif # NCURSESW_BUILDLINK3_MK .include "../../devel/ncurses/buildlink3.mk" diff --git a/devel/ncursesw/builtin.mk b/devel/ncursesw/builtin.mk index 7ed2f26f2c2..25ddde0e8f4 100644 --- a/devel/ncursesw/builtin.mk +++ b/devel/ncursesw/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.6 2008/02/22 13:48:21 tron Exp $ +# $NetBSD: builtin.mk,v 1.7 2008/02/29 19:23:07 jlam Exp $ BUILTIN_PKG:= ncursesw @@ -7,7 +7,7 @@ BUILTIN_PKG:= ncursesw # # XXX Need to deal with Solaris <curses.h> # -BUILTIN_FIND_LIBS:= ncursesw +BUILTIN_FIND_LIBS:= ncursesw curses BUILTIN_FIND_FILES_VAR:= H_NB_CURSESW H_NCURSESW BUILTIN_FIND_FILES.H_NB_CURSESW= /usr/include/curses.h BUILTIN_FIND_GREP.H_NB_CURSESW= \#ifdef[ ]*HAVE_WCHAR @@ -94,6 +94,15 @@ MAKEVARS+= USE_BUILTIN.ncursesw USE_BUILTIN.ncursesw= no .endif +# Define BUILTIN_LIBNAME.ncursesw to be the base name of the built-in +# ncursesw library. +# +.if !empty(BUILTIN_LIB_FOUND.ncursesw:M[yY][eE][sS]) +BUILTIN_LIBNAME.ncursesw= ncursesw +.elif !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) +BUILTIN_LIBNAME.ncursesw= curses +.endif + ### ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. @@ -102,9 +111,8 @@ CHECK_BUILTIN.ncursesw?= no .if !empty(CHECK_BUILTIN.ncursesw:M[nN][oO]) . if !empty(USE_BUILTIN.ncursesw:M[yY][eE][sS]) -. if !empty(BUILTIN_LIB_FOUND.ncursesw:M[nN][oO]) -BUILDLINK_TRANSFORM+= l:ncursesw:curses -. endif +BUILDLINK_LIBNAME.ncursesw= ${BUILTIN_LIBNAME.ncursesw} +BUILDLINK_TRANSFORM+= l:ncursesw:${BUILTIN_LIBNAME.ncursesw} . if empty(H_NB_CURSESW:M__nonexistent__) && \ empty(H_NB_CURSESW:M${LOCALBASE}/*) BUILDLINK_CPPFLAGS.ncursesw+= -DHAVE_WCHAR=1 |