diff options
author | grant <grant> | 2005-08-19 06:12:09 +0000 |
---|---|---|
committer | grant <grant> | 2005-08-19 06:12:09 +0000 |
commit | 37141c61c2f8d11825079312f6b3cf0d8ceeec93 (patch) | |
tree | c7569ff9c9de754f4039804cde3b683e7eaf28cf /lang/python20 | |
parent | 11612ebb96329f7cd6816356de0cdb429125502d (diff) | |
download | pkgsrc-37141c61c2f8d11825079312f6b3cf0d8ceeec93.tar.gz |
include LDFLAGS when linking shared libraries, so they can find their
prerequisite libraries at runtime.
fixes build on Solaris (and probably others).
Diffstat (limited to 'lang/python20')
-rw-r--r-- | lang/python20/distinfo | 8 | ||||
-rw-r--r-- | lang/python20/patches/patch-ab | 19 | ||||
-rw-r--r-- | lang/python20/patches/patch-ad | 19 | ||||
-rw-r--r-- | lang/python20/patches/patch-ae | 15 | ||||
-rw-r--r-- | lang/python20/patches/patch-af | 13 |
5 files changed, 63 insertions, 11 deletions
diff --git a/lang/python20/distinfo b/lang/python20/distinfo index 24d07e008ef..74fe1f24685 100644 --- a/lang/python20/distinfo +++ b/lang/python20/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.8 2005/07/29 13:27:26 drochner Exp $ +$NetBSD: distinfo,v 1.9 2005/08/19 06:12:09 grant Exp $ SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab RMD160 (python/Python-2.0.1.tgz) = fe663234ff4a8b363f10f6e5589acf1d8b00573f Size (python/Python-2.0.1.tgz) = 4097453 bytes SHA1 (patch-aa) = 2db263ea719733692536bb4a9990659099583351 -SHA1 (patch-ab) = 670cd69d67566bf61d152e3433161c0f146be1b3 +SHA1 (patch-ab) = 6a2bbaafdc21e7dcde84af7f4dbd9acdfde2aaf0 SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83 -SHA1 (patch-ad) = 08096aea74ab4871309124cd28a3b98d83cb322f +SHA1 (patch-ad) = f545b33bde36eac8737458506f3fdb25c0f39b5d +SHA1 (patch-ae) = e962dad92260a1f506298ba3ebb059e852c4ccf4 +SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc SHA1 (patch-bb) = adab8436d470acdc07149fdd6eed09c20ebf965e SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc diff --git a/lang/python20/patches/patch-ab b/lang/python20/patches/patch-ab index 76166da6edc..116938afeec 100644 --- a/lang/python20/patches/patch-ab +++ b/lang/python20/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2002/01/16 20:27:11 drochner Exp $ +$NetBSD: patch-ab,v 1.2 2005/08/19 06:12:09 grant Exp $ ---- Misc/Makefile.pre.in.orig Wed Jan 16 21:11:24 2002 -+++ Misc/Makefile.pre.in Wed Jan 16 21:11:43 2002 -@@ -92,7 +92,7 @@ +--- Misc/Makefile.pre.in.orig 2000-07-01 02:03:53.000000000 +1000 ++++ Misc/Makefile.pre.in +@@ -92,7 +92,7 @@ VPATH= . TARGET= python # Installed python binary (used only by boot target) @@ -11,3 +11,14 @@ $NetBSD: patch-ab,v 1.1 2002/01/16 20:27:11 drochner Exp $ # Add more -I and -D options here CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) +@@ -125,8 +125,8 @@ LIBC= @LIBC@ + RANLIB= @RANLIB@ + MACHDEP= @MACHDEP@ + SO= @SO@ +-LDSHARED= @LDSHARED@ +-CCSHARED= @CCSHARED@ ++LDSHARED= @LDSHARED@ $(LDFLAGS) ++CCSHARED= @CCSHARED@ $(LDFLAGS) + LINKFORSHARED= @LINKFORSHARED@ + #@SET_CCC@ + diff --git a/lang/python20/patches/patch-ad b/lang/python20/patches/patch-ad index 2424d7fdbeb..87e1e8688de 100644 --- a/lang/python20/patches/patch-ad +++ b/lang/python20/patches/patch-ad @@ -1,8 +1,19 @@ -$NetBSD: patch-ad,v 1.1 2003/06/06 18:14:10 drochner Exp $ +$NetBSD: patch-ad,v 1.2 2005/08/19 06:12:09 grant Exp $ ---- Modules/Makefile.pre.in.orig 2003-06-06 20:01:16.000000000 +0200 -+++ Modules/Makefile.pre.in 2003-06-06 20:01:48.000000000 +0200 -@@ -124,7 +124,7 @@ +--- Modules/Makefile.pre.in.orig 2000-10-10 03:48:09.000000000 +1100 ++++ Modules/Makefile.pre.in +@@ -59,8 +59,8 @@ LIBP= $(LIBDIR)/python$(VERSION) + + # Symbols used for using shared libraries + SO= @SO@ +-LDSHARED= @LDSHARED@ +-CCSHARED= @CCSHARED@ ++LDSHARED= @LDSHARED@ $(LDFLAGS) ++CCSHARED= @CCSHARED@ $(LDFLAGS) + LINKFORSHARED= @LINKFORSHARED@ + DESTSHARED= $(BINLIBDEST)/lib-dynload + +@@ -124,7 +124,7 @@ add2lib: $(OBJS) # This target is used by the master Makefile to link the final binary. link: $(MAINOBJ) $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \ diff --git a/lang/python20/patches/patch-ae b/lang/python20/patches/patch-ae new file mode 100644 index 00000000000..e8a9b6434a8 --- /dev/null +++ b/lang/python20/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2005/08/19 06:12:09 grant Exp $ + +--- Makefile.in.orig 2000-10-10 06:31:40.000000000 +1100 ++++ Makefile.in +@@ -81,8 +81,8 @@ LIBP= $(LIBDIR)/python$(VERSION) + + # Symbols used for using shared libraries + SO= @SO@ +-LDSHARED= @LDSHARED@ +-CCSHARED= @CCSHARED@ ++LDSHARED= @LDSHARED@ $(LDFLAGS) ++CCSHARED= @CCSHARED@ $(LDFLAGS) + LINKFORSHARED= @LINKFORSHARED@ + DESTSHARED= $(BINLIBDEST)/lib-dynload + diff --git a/lang/python20/patches/patch-af b/lang/python20/patches/patch-af new file mode 100644 index 00000000000..bf5aaf2d318 --- /dev/null +++ b/lang/python20/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2005/08/19 06:12:09 grant Exp $ + +--- Parser/Makefile.in.orig 2000-08-31 16:11:48.000000000 +1100 ++++ Parser/Makefile.in +@@ -14,7 +14,7 @@ RANLIB= @RANLIB@ + AR= @AR@ + + DEFS= @DEFS@ +-LIBS= @LIBS@ ++LIBS= $(LDFLAGS) @LIBS@ + + + # === Other things that are customizable but not by configure === |