diff options
| author | tv <tv> | 2004-10-13 20:10:31 +0000 |
|---|---|---|
| committer | tv <tv> | 2004-10-13 20:10:31 +0000 |
| commit | e8a8cfbbc06eb8b3102f1cf781f48c0d20bf68fb (patch) | |
| tree | ae3427e677d8958118b7df9ac066c95d4d37cb4f | |
| parent | 96725f91c27e9bb4e38136569f8f3b3bd094d0e1 (diff) | |
| download | pkgsrc-e8a8cfbbc06eb8b3102f1cf781f48c0d20bf68fb.tar.gz | |
Oy, what a hack. But then, so is Interix....
On Interix, force inclusion of devel/ncurses/buildlink3.mk from
mk/curses.buildlink3.mk. This forces inclusion of its builtin.mk too.
In devel/ncurses/builtin.mk, if using Interix's builtin ncurses, always
transform -lncurses to -lcurses. (-lncurses is static, but -lcurses is
shared; we want the shared version.)
| -rw-r--r-- | devel/ncurses/builtin.mk | 5 | ||||
| -rw-r--r-- | mk/curses.buildlink3.mk | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index c7607797fd1..6b9edd8adb9 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2004/10/13 20:10:31 tv Exp $ .if !defined(_BLNK_LIBNCURSES_FOUND) _BLNK_LIBNCURSES_FOUND!= \ @@ -99,7 +99,8 @@ CHECK_BUILTIN.ncurses?= no .if !empty(CHECK_BUILTIN.ncurses:M[nN][oO]) .if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS]) -. if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO]) +. include "../../mk/bsd.prefs.mk" +. if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO]) || ${OPSYS} == "Interix" BUILDLINK_TRANSFORM.ncurses+= -e "s|/curses\.h|/ncurses.h|g" BUILDLINK_TRANSFORM+= l:ncurses:curses . endif diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk index fcd4cd91f6c..9daa70acf30 100644 --- a/mk/curses.buildlink3.mk +++ b/mk/curses.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.buildlink3.mk,v 1.2 2004/03/18 09:12:13 jlam Exp $ +# $NetBSD: curses.buildlink3.mk,v 1.3 2004/10/13 20:10:31 tv Exp $ # # This file should be included by Makefiles for packages that use curses. # If a system curses isn't available, then add a dependency on ncurses. @@ -9,4 +9,13 @@ .if !exists(/usr/include/curses.h) && \ !exists(/usr/include/ncurses.h) . include "../../devel/ncurses/buildlink3.mk" +.else + +# XXX this is ugly, but needed to get the BUILDLINK_TRANSFORM from builtin.mk; +# on Interix, libncurses is static yet libcurses (also ncurses) is shared +. include "../../mk/bsd.prefs.mk" +. if ${OPSYS} == "Interix" +. include "../../devel/ncurses/buildlink3.mk" +. endif + .endif |