[pkgsrc/pkgsrc-2005Q2]: pkgsrc/lang/python24 Pullup ticket 697 - requested by...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a0bd2067d76
branches:  pkgsrc-2005Q2
changeset: 496011:0a0bd2067d76
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 20 16:01:13 2005 +0000

description:
Pullup ticket 697 - requested by Grant Beattie
portability fix for python24

Revisions pulled up:
- pkgsrc/lang/python24/distinfo                 1.11
- pkgsrc/lang/python24/patches/patch-af         1.3

   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Fri Aug 19 05:22:04 UTC 2005

   Modified Files:
        pkgsrc/lang/python24: distinfo
        pkgsrc/lang/python24/patches: patch-af

   Log Message:
   include LDFLAGS when linking shared libraries, so they can find their
   prerequisite libraries at runtime.

   fixes build on Solaris (and probably others).

diffstat:

 lang/python24/distinfo         |   4 ++--
 lang/python24/patches/patch-af |  15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 2b08682c2bb6 -r 0a0bd2067d76 lang/python24/distinfo
--- a/lang/python24/distinfo    Sat Aug 20 15:34:28 2005 +0000
+++ b/lang/python24/distinfo    Sat Aug 20 16:01:13 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/05/29 00:51:17 minskim Exp $
+$NetBSD: distinfo,v 1.9.2.1 2005/08/20 16:01:13 salo Exp $
 
 SHA1 (Python-2.4.1.tar.bz2) = a4b58cf31359198dbb123b789440bcaf9052d198
 RMD160 (Python-2.4.1.tar.bz2) = 8c682c9af21666cc6b8eaa08f8719eed231ab3ad
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
 SHA1 (patch-ad) = 0fa1c66fa0ad9ce345c44b13fd3897975837c72e
 SHA1 (patch-ae) = 7232b64cc3d201daf0bc00476eb58aa694a6df2a
-SHA1 (patch-af) = e7c0f100b2255942d5f8b8c02723b184cdaeceac
+SHA1 (patch-af) = 849efb1de808d9f8cd100252a209c707fa6ba34b
 SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
 SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
diff -r 2b08682c2bb6 -r 0a0bd2067d76 lang/python24/patches/patch-af
--- a/lang/python24/patches/patch-af    Sat Aug 20 15:34:28 2005 +0000
+++ b/lang/python24/patches/patch-af    Sat Aug 20 16:01:13 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/05/09 20:37:51 recht Exp $
+$NetBSD: patch-af,v 1.2.2.1 2005/08/20 16:01:13 salo 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 @@
  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 $@ \