summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2005-08-19 05:22:04 +0000
committergrant <grant@pkgsrc.org>2005-08-19 05:22:04 +0000
commit9cfb53fa80842d9fffc38977127fb37bc527aeff (patch)
treea5143d4adccaa6a5f267305fcd429ce52bb8027c /lang
parent16f2d72474bdbeb686b1fb37ef64c022e54fcb05 (diff)
downloadpkgsrc-9cfb53fa80842d9fffc38977127fb37bc527aeff.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')
-rw-r--r--lang/python24/distinfo4
-rw-r--r--lang/python24/patches/patch-af15
2 files changed, 15 insertions, 4 deletions
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index ce34407a04b..cd8b262b5da 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/07/29 13:27:26 drochner Exp $
+$NetBSD: distinfo,v 1.11 2005/08/19 05:22:04 grant Exp $
SHA1 (Python-2.4.1.tar.bz2) = a4b58cf31359198dbb123b789440bcaf9052d198
RMD160 (Python-2.4.1.tar.bz2) = 8c682c9af21666cc6b8eaa08f8719eed231ab3ad
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
SHA1 (patch-ad) = 0fa1c66fa0ad9ce345c44b13fd3897975837c72e
SHA1 (patch-ae) = b220db11ed4db2ef6ec34be8a10bd054660a3138
-SHA1 (patch-af) = e7c0f100b2255942d5f8b8c02723b184cdaeceac
+SHA1 (patch-af) = 849efb1de808d9f8cd100252a209c707fa6ba34b
SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
diff --git a/lang/python24/patches/patch-af b/lang/python24/patches/patch-af
index 2f0a6af5f66..94d5f1c4120 100644
--- a/lang/python24/patches/patch-af
+++ b/lang/python24/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/05/09 20:37:51 recht Exp $
+$NetBSD: patch-af,v 1.3 2005/08/19 05:22:04 grant Exp $
---- Makefile.pre.in.orig Sun Sep 26 19:26:55 2004
+--- Makefile.pre.in.orig 2005-03-29 09:23:01.000000000 +1000
+++ Makefile.pre.in
@@ -56,7 +56,7 @@ MAKESETUP= $(srcdir)/Modules/makese
OPT= @OPT@
@@ -11,6 +11,17 @@ $NetBSD: patch-af,v 1.2 2005/05/09 20:37:51 recht Exp $
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
+@@ -94,8 +94,8 @@ LIBP= $(LIBDIR)/python$(VERSION)
+
+ # Symbols used for using shared libraries
+ SO= @SO@
+-LDSHARED= @LDSHARED@
+-BLDSHARED= @BLDSHARED@
++LDSHARED= @LDSHARED@ $(LDFLAGS)
++BLDSHARED= @BLDSHARED@ $(LDFLAGS)
+ DESTSHARED= $(BINLIBDEST)/lib-dynload
+
+ # Executable suffix (.exe on Windows and Mac OS X)
@@ -311,7 +311,7 @@ all: $(BUILDPYTHON) oldsharedmods share
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \