add the LINK_ALL_LIBGCC_HACK variable to the interpreter's link line,

so that dynamic libraries using libgcc functions can be loaded
should fix PR pkg/16144 by Brett Slager

12 files changed, 67 insertions, 12 deletions

diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index bfa8724c319..d66c13155bf 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:18:57 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/06 18:14:09 drochner Exp $
 #
 
 DISTNAME=	py152
@@ -14,6 +14,7 @@ COMMENT=	Interpreted, interactive, object-oriented programming language
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--without-thread
+MAKE_ENV+=	LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
 
 INSTALL_TARGET=	altinstall
 
diff --git a/lang/python15/distinfo b/lang/python15/distinfo
index 64531439be2..b76396971ef 100644
--- a/lang/python15/distinfo
+++ b/lang/python15/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2002/01/31 23:18:10 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/06/06 18:14:09 drochner Exp $
 
 SHA1 (py152.tgz) = 2d648d07b1aa1aab32a3a24851c33715141779b9
 Size (py152.tgz) = 2533053 bytes
 SHA1 (patch-aa) = 229ad8a0fda51641dd80c7765e10cfdda2dc2ceb
+SHA1 (patch-ab) = 7cbbae8a41e9e0d530561c80009c20bb838ebc15
diff --git a/lang/python15/patches/patch-ab b/lang/python15/patches/patch-ab
new file mode 100644
index 00000000000..fb9f43a287d
--- /dev/null
+++ b/lang/python15/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/06/06 18:14:10 drochner Exp $
+
+--- Modules/Makefile.pre.in.orig	2003-06-06 20:07:06.000000000 +0200
++++ Modules/Makefile.pre.in	2003-06-06 20:07:38.000000000 +0200
+@@ -123,7 +123,7 @@
+ # This target is used by the master Makefile to link the final binary.
+ link:		$(MAINOBJ)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \
+-		  $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST)
++		  $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
+ 		mv python$(EXE) ../python$(EXE)
+ 
+ clean:
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 8ff448c3b45..e6ca052b7f5 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/06 18:14:10 drochner Exp $
 #
 
 DISTNAME=	Python-2.0.1
@@ -27,6 +27,7 @@ INSTALL_TARGET=	altinstall
 # Make sure having environment variable OPT doesn't affect the
 # installed module-building Makefile
 MAKE_ENV+=	'OPT=${CFLAGS}'
+MAKE_ENV+=	LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
 CONFIGURE_ENV+=	'OPT=${CFLAGS}'
 SCRIPTS_ENV+=	'OPT=${CFLAGS}'
 
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index c4af76f8a67..a1d6744349c 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/01/28 09:07:24 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/06/06 18:14:10 drochner Exp $
 
 SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
 Size (python/Python-2.0.1.tgz) = 4097453 bytes
 SHA1 (patch-aa) = 2db263ea719733692536bb4a9990659099583351
 SHA1 (patch-ab) = 670cd69d67566bf61d152e3433161c0f146be1b3
 SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83
+SHA1 (patch-ad) = 08096aea74ab4871309124cd28a3b98d83cb322f
diff --git a/lang/python20/patches/patch-ad b/lang/python20/patches/patch-ad
new file mode 100644
index 00000000000..2424d7fdbeb
--- /dev/null
+++ b/lang/python20/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/06/06 18:14:10 drochner 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 @@
+ # This target is used by the master Makefile to link the final binary.
+ link:		$(MAINOBJ)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \
+-		  $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python$(EXE) $(LDLAST)
++		  $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python$(EXE) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
+ 		mv python$(EXE) ../python$(EXE)
+ 
+ clean:
diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile
index 01c974e2ab5..fada1121b2e 100644
--- a/lang/python21-pth/Makefile
+++ b/lang/python21-pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:18:57 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/06 18:14:11 drochner Exp $
 #
 
 DISTNAME=	Python-2.1.3
@@ -20,6 +20,7 @@ PTHREAD_OPTS=	require
 .if ${PTHREAD_TYPE} == "pth"
 CONFIGURE_ARGS+=	--with-pth
 .endif
+MAKE_ENV+=	LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
 
 INSTALL_TARGET=	altinstall
 
diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo
index dfe0871b382..d3cf1b2571f 100644
--- a/lang/python21-pth/distinfo
+++ b/lang/python21-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/04/15 16:52:30 drochner Exp $
+$NetBSD: distinfo,v 1.7 2003/06/06 18:14:12 drochner Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 Size (Python-2.1.3.tgz) = 6194432 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = e39bbe1e46bfc535dc887eeb9059e0c500c393db
 SHA1 (patch-ac) = 042664030635fdcc1516c66b12568f1d5cb987d1
 SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
 SHA1 (patch-ae) = 079cd208ba57755a7e0f3ac03b6ba59d622be5db
-SHA1 (patch-af) = 2caa6dd54088b1866679338df2c1311c4718cf0f
+SHA1 (patch-af) = 4e446bd88334dbee441f6a8dc41e7eaeb771e773
 SHA1 (patch-ag) = fa9a5f13072d9137182675394f04cd9b163d3a5c
 SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
 SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
diff --git a/lang/python21-pth/patches/patch-af b/lang/python21-pth/patches/patch-af
index 7a694008e69..bbfb868e892 100644
--- a/lang/python21-pth/patches/patch-af
+++ b/lang/python21-pth/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
+$NetBSD: patch-af,v 1.2 2003/06/06 18:14:12 drochner Exp $
 
---- Makefile.pre.in.orig	Thu Jul 19 15:21:05 2001
-+++ Makefile.pre.in	Tue Aug 20 16:53:43 2002
+--- Makefile.pre.in.orig	2001-07-19 15:21:05.000000000 +0200
++++ Makefile.pre.in	2003-06-06 19:35:30.000000000 +0200
 @@ -55,7 +55,7 @@
  # Compiler options
  OPT=		@OPT@
@@ -11,6 +11,15 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
+@@ -274,7 +274,7 @@
+ $(PYTHON):	Modules/$(MAINOBJ) $(LDLIBRARY)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/$(MAINOBJ) \
+-			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
+ 
+ platform: $(PYTHON)
+ 	./$(PYTHON) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
 @@ -386,7 +386,7 @@
  		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
  
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 9b9509774c6..16ea1eb6e79 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 01:18:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/06 18:14:11 drochner Exp $
 #
 
 DISTNAME=	Python-2.1.3
@@ -15,6 +15,7 @@ COMMENT=	Interpreted, interactive, object-oriented programming language
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-threads
+MAKE_ENV+=	LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
 
 INSTALL_TARGET=	altinstall
 
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index 4244e153f67..e78e3e31d56 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/04/15 16:52:29 drochner Exp $
+$NetBSD: distinfo,v 1.11 2003/06/06 18:14:11 drochner Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 Size (Python-2.1.3.tgz) = 6194432 bytes
@@ -6,6 +6,7 @@ SHA1 (patch-aa) = 8273acc49a9eedad6e09685098178f3b7fb8f1c6
 SHA1 (patch-ab) = f87a4d5c76182ab27ba79b42f00e8a2ff63bcf2b
 SHA1 (patch-ac) = 397454551beaa8dd11e0a5c171cbdb4f4501a9a3
 SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
+SHA1 (patch-af) = e17c20f83ba1219860a6aefd959364147c7963e1
 SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
 SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
 SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
diff --git a/lang/python21/patches/patch-af b/lang/python21/patches/patch-af
new file mode 100644
index 00000000000..c95cd3fc1fa
--- /dev/null
+++ b/lang/python21/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/06/06 18:14:11 drochner Exp $
+
+--- Makefile.pre.in.orig	2003-06-06 19:47:05.000000000 +0200
++++ Makefile.pre.in	2003-06-06 19:47:33.000000000 +0200
+@@ -274,7 +274,7 @@
+ $(PYTHON):	Modules/$(MAINOBJ) $(LDLIBRARY)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/$(MAINOBJ) \
+-			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++			$(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
+ 
+ platform: $(PYTHON)
+ 	./$(PYTHON) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform