diff options
| author | dbj <dbj@pkgsrc.org> | 2008-07-20 23:35:20 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2008-07-20 23:35:20 +0000 |
| commit | 7648dba7fbe0eb1c66dd2d5ee0b7e747f66536e2 (patch) | |
| tree | eae94f3a1cc5576719e92e8157de2cee1c7cb489 /x11/tk | |
| parent | 43c8f0b2ee26d082869d4dd1323255c4b3ed235d (diff) | |
| download | pkgsrc-7648dba7fbe0eb1c66dd2d5ee0b7e747f66536e2.tar.gz | |
include LDFLAGS when creating shared library.
This fixes build problems on darwin
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/distinfo | 6 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ab | 4 | ||||
| -rw-r--r-- | x11/tk/patches/patch-ac | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo index 8fc5ce2fb25..77c0eff7489 100644 --- a/x11/tk/distinfo +++ b/x11/tk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2008/04/07 15:14:10 bjs Exp $ +$NetBSD: distinfo,v 1.33 2008/07/20 23:35:20 dbj Exp $ SHA1 (tk8.4.18-src.tar.gz) = c1032f3cacd40406065fc1f46ecd217f50329273 RMD160 (tk8.4.18-src.tar.gz) = 9c01ba85575a230231793a9885457c98046e41bb Size (tk8.4.18-src.tar.gz) = 3363853 bytes SHA1 (patch-aa) = b729957a24ce2fb6f972bbb19af27bd7d41f1846 -SHA1 (patch-ab) = 09c385b45dc7c6845086ece752b9cfdee7611e06 -SHA1 (patch-ac) = 17a266317ca7c7951794efaf5aafc60dc54ffd6e +SHA1 (patch-ab) = a5b2a508a114b5f4d033251231b396ed68f22995 +SHA1 (patch-ac) = 5ded83db659d8918710b4b96126d20bed9ce11b8 SHA1 (patch-ad) = 14ad16e840a825e987721f23c6308c4a011dbe01 diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index 1c0632e670a..586a12d98b9 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.28 2007/10/13 11:41:33 adam Exp $ +$NetBSD: patch-ab,v 1.29 2008/07/20 23:35:20 dbj Exp $ --- unix/configure.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/configure @@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.28 2007/10/13 11:41:33 adam Exp $ LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' -+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' ++ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS:.o=.lo} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' + INSTALL_LIB='$(INSTALL_LIBRARY) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac index 8fbaf7b73d7..95f080675af 100644 --- a/x11/tk/patches/patch-ac +++ b/x11/tk/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.18 2007/10/13 11:41:34 adam Exp $ +$NetBSD: patch-ac,v 1.19 2008/07/20 23:35:20 dbj Exp $ ---- unix/tcl.m4.orig 2007-09-21 19:04:18.000000000 +0200 -+++ unix/tcl.m4 +--- unix/tcl.m4.orig 2007-09-21 10:04:18.000000000 -0700 ++++ unix/tcl.m4 2008-04-16 15:30:21.000000000 -0700 @@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Step 3: set configuration options based on system name and version. @@ -96,7 +96,7 @@ $NetBSD: patch-ac,v 1.18 2007/10/13 11:41:34 adam Exp $ LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' -+ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' ++ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${OBJS:.o=.lo} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} |