[pkgsrc/pkgsrc-2005Q2]: pkgsrc/lang/python20 Pullup ticket 698 - requested by...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/lang/python20 Pullup ticket 698 - requested by...
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:59:22 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/eded24821d3a
branches:  pkgsrc-2005Q2
changeset: 496012:eded24821d3a
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 20 16:03:20 2005 +0000

description:
Pullup ticket 698 - requested by Grant Beattie
portability fix for python20

Revisions pulled up:
- pkgsrc/lang/python20/Makefile                 1.28
- pkgsrc/lang/python20/distinfo                 1.9
- pkgsrc/lang/python20/patches/patch-ab         1.2
- pkgsrc/lang/python20/patches/patch-ad         1.2
- pkgsrc/lang/python20/patches/patch-ae         1.1
- pkgsrc/lang/python20/patches/patch-af         1.1

   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Fri Aug 19 06:06:09 UTC 2005

   Modified Files:
        pkgsrc/lang/python20: Makefile

   Log Message:
   nuke broken pre-configure target, which does nothing useful.

   it was broken because the delimeter , can appear in the RHS of the
   sed(1) expression (think "-Wl,-R ..."), and it does nothing useful
   because the patterns don't appear in the files.
---
   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Fri Aug 19 06:12:09 UTC 2005

   Modified Files:
        pkgsrc/lang/python20: distinfo
        pkgsrc/lang/python20/patches: patch-ab patch-ad
   Added Files:
        pkgsrc/lang/python20/patches: patch-ae 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/python20/Makefile         |  11 +----------
 lang/python20/distinfo         |   8 +++++---
 lang/python20/patches/patch-ab |  19 +++++++++++++++----
 lang/python20/patches/patch-ad |  19 +++++++++++++++----
 lang/python20/patches/patch-ae |  15 +++++++++++++++
 lang/python20/patches/patch-af |  13 +++++++++++++
 6 files changed, 64 insertions(+), 21 deletions(-)

diffs (140 lines):

diff -r 0a0bd2067d76 -r eded24821d3a lang/python20/Makefile
--- a/lang/python20/Makefile    Sat Aug 20 16:01:13 2005 +0000
+++ b/lang/python20/Makefile    Sat Aug 20 16:03:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2005/08/20 16:03:20 salo Exp $
 #
 
 DISTNAME=      Python-2.0.1
@@ -47,15 +47,6 @@
 FIX_RPATH+=    MODADD
 .endif
 
-pre-configure:
-       ${SED}  -e 's,@NOSHARED@,${NOSHARED},g' \
-               -e 's,@MODADD@,${MODADD},g' \
-               -e 's+@SSLFLAGS@+${SSLFLAGS}+g' \
-               ${FILESDIR}/Setup.in >${WRKSRC}/Modules/Setup.in
-       ${SED}  -e 's,@NOSHARED@,${NOSHARED},g' \
-               -e 's,@MODADD@,${MODADD},g' \
-               ${FILESDIR}/Setup.config.in >${WRKSRC}/Modules/Setup.config.in
-
 post-install:
        ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
        (cd ${PREFIX}; ${FIND} lib/python2.0 -type f -print | \
diff -r 0a0bd2067d76 -r eded24821d3a lang/python20/distinfo
--- a/lang/python20/distinfo    Sat Aug 20 16:01:13 2005 +0000
+++ b/lang/python20/distinfo    Sat Aug 20 16:03:20 2005 +0000
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:03:11 agc Exp $
+$NetBSD: distinfo,v 1.7.4.1 2005/08/20 16:03:20 salo 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) = 8d3c18ea43843dda48d60461a5a216a5237cc5f2
 SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
 SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff -r 0a0bd2067d76 -r eded24821d3a lang/python20/patches/patch-ab
--- a/lang/python20/patches/patch-ab    Sat Aug 20 16:01:13 2005 +0000
+++ b/lang/python20/patches/patch-ab    Sat Aug 20 16:03:20 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2002/01/16 20:27:11 drochner Exp $
+$NetBSD: patch-ab,v 1.1.22.1 2005/08/20 16:03:20 salo 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 @@
  
  # 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 -r 0a0bd2067d76 -r eded24821d3a lang/python20/patches/patch-ad
--- a/lang/python20/patches/patch-ad    Sat Aug 20 16:01:13 2005 +0000
+++ b/lang/python20/patches/patch-ad    Sat Aug 20 16:03:20 2005 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-ad,v 1.1 2003/06/06 18:14:10 drochner Exp $
+$NetBSD: patch-ad,v 1.1.14.1 2005/08/20 16:03:20 salo 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 -r 0a0bd2067d76 -r eded24821d3a lang/python20/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python20/patches/patch-ae    Sat Aug 20 16:03:20 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/08/20 16:03:20 salo 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 -r 0a0bd2067d76 -r eded24821d3a lang/python20/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python20/patches/patch-af    Sat Aug 20 16:03:20 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.2.2 2005/08/20 16:03:20 salo 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 ===
Prev by Date: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/doc #697, #698
Next by Date: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/games/xdemineur Pullup ticket 703 - requested ...
Previous by Thread: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/doc #697, #698
Next by Thread: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/games/xdemineur Pullup ticket 703 - requested ...
Indexes:
Home | Main Index | Thread Index | Old Index