diff options
| author | agc <agc@pkgsrc.org> | 2005-05-10 16:17:06 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2005-05-10 16:17:06 +0000 |
| commit | 85963169a68afd00e7c38ea451ca63d12721d24f (patch) | |
| tree | 0a5a7b451537dfcc481b7eadca0a295b9033f20b /x11 | |
| parent | 61bb9d30110e8bd1ad49723c1ce31ceeafe6e57a (diff) | |
| download | pkgsrc-85963169a68afd00e7c38ea451ca63d12721d24f.tar.gz | |
Don't include $(TK_CC_SEARCH_FLAGS) in the ${LD} link commands, since this
does not work - as evidenced in numerous bulk build results.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/tk83/distinfo | 4 | ||||
| -rw-r--r-- | x11/tk83/patches/patch-aa | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo index ce93577e5b8..8ffdca90008 100644 --- a/x11/tk83/distinfo +++ b/x11/tk83/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2005/03/06 22:41:28 jschauma Exp $ +$NetBSD: distinfo,v 1.4 2005/05/10 16:17:06 agc Exp $ SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2 RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26 Size (tk8.3.4.tar.gz) = 2589635 bytes -SHA1 (patch-aa) = 213c82956f692cc493215e222c08da76cf18841e +SHA1 (patch-aa) = 41749b2d76a3bb87d39d472dfa3c2237a623bc89 SHA1 (patch-ab) = 0a75ddf9d30ba4e4800f8139674f712785ae83af SHA1 (patch-ac) = 4b2b967030998dc108457258ee603fa94185cfe5 SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9 diff --git a/x11/tk83/patches/patch-aa b/x11/tk83/patches/patch-aa index 8cc5cb1879b..d104e13caeb 100644 --- a/x11/tk83/patches/patch-aa +++ b/x11/tk83/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $ +$NetBSD: patch-aa,v 1.2 2005/05/10 16:17:07 agc Exp $ ---- Makefile.in.orig Sat Oct 20 02:24:40 2001 -+++ Makefile.in +--- Makefile.in.orig 2001-10-20 01:24:40.000000000 +0100 ++++ Makefile.in 2005-05-10 17:01:34.000000000 +0100 @@ -76,7 +76,7 @@ # The directory containing the Tcl sources and headers appropriate # for this version of Tk ("srcdir" will be replaced or has already @@ -58,15 +58,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} -@@ -391,7 +393,7 @@ +@@ -391,9 +393,9 @@ wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) - $(CC) $(LDFLAGS) $(WISH_OBJS) \ + $(LD) $(LDFLAGS) $(WISH_OBJS) \ @TK_BUILD_LIB_SPEC@ \ - $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish +- $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish ++ $(WISH_LIBS) -o wish + # This rule is executed if the user tried to run tktest without first + # building tcltest in the Tcl bin directory. Just do it for them. @@ -402,12 +404,12 @@ make tcltest @@ -74,7 +77,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 20:07:40 minskim Exp $ - ${CC} $(LDFLAGS) $(TKTEST_OBJS) \ + ${LD} $(LDFLAGS) $(TKTEST_OBJS) \ @TK_BUILD_LIB_SPEC@ \ - $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest +- $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest ++ $(WISH_LIBS) -o tktest xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE) - ${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \ |