Honor LDFLAGS when building shared libraries on Linux. Previously,

python2[34]{,-pth} failed on Linux when Berkeley DB from pkgsrc was
used.

8 files changed, 61 insertions, 45 deletions

diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
index 0265ae66477..ec11f057e46 100644
--- a/lang/python23-pth/distinfo
+++ b/lang/python23-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2004/11/28 13:33:20 recht Exp $
+$NetBSD: distinfo,v 1.20 2004/12/30 21:56:21 minskim Exp $
 
 SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
 Size (Python-2.3.4.tgz) = 8502738 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 35d27825ea4f3930cce651761e192a7302696eba
 SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
 SHA1 (patch-ah) = f9a46bfe82acec594cf44afd43f359a5248edadb
-SHA1 (patch-al) = 72c155d28675c10e30a0b13f33f6d1a52457ee47
+SHA1 (patch-al) = 3e01ac0b4fb8843fc3191a830fbac35728d2f6f1
 SHA1 (patch-am) = eda4c6161b4237e1281cc6b82b26c5195444dcff
 SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
 SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
diff --git a/lang/python23-pth/patches/patch-al b/lang/python23-pth/patches/patch-al
index 844dacc715f..22e980e2508 100644
--- a/lang/python23-pth/patches/patch-al
+++ b/lang/python23-pth/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
+$NetBSD: patch-al,v 1.9 2004/12/30 21:56:21 minskim Exp $
 
---- configure.orig	Fri May  7 21:13:40 2004
-+++ configure	Thu Nov 25 13:20:20 2004
-@@ -1318,7 +1318,7 @@
+--- configure.orig	2004-05-07 14:13:40.000000000 -0500
++++ configure
+@@ -1318,7 +1318,7 @@ rm confdefs.h
  mv confdefs.h.new confdefs.h
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
  
  
  SOVERSION=1.0
-@@ -1440,6 +1440,8 @@
+@@ -1440,6 +1440,8 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[01234])
      define_xopen_source=no;;
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3603,7 +3605,7 @@
+@@ -3603,7 +3605,7 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -29,7 +29,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3624,6 +3626,14 @@
+@@ -3624,6 +3626,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -44,7 +44,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
    esac
    # DG/UX requires some fancy ld contortions to produce a .so from an .a
    case $MACHDEP in
-@@ -4021,7 +4031,12 @@
+@@ -4021,7 +4031,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -58,7 +58,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
  	    ;;
      esac
      ;;
-@@ -10082,7 +10097,7 @@
+@@ -10082,7 +10097,7 @@ then
  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
@@ -67,7 +67,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
  		fi ;;
  	Darwin/*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10091,8 +10106,8 @@
+@@ -10091,10 +10106,10 @@ then
  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -76,9 +76,12 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:20 recht Exp $
 +			BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
 +			LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
  		fi ;;
- 	Linux*|GNU*) LDSHARED='$(CC) -shared';;
+-	Linux*|GNU*) LDSHARED='$(CC) -shared';;
++	Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
  	dgux*) LDSHARED="ld -G";;
-@@ -13855,6 +13870,7 @@
+ 	BSD/OS*/4*) LDSHARED="gcc -shared";;
+ 	OpenBSD*|FreeBSD*)
+@@ -13855,6 +13870,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 4f99222d71d..210c9737a35 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2004/11/28 13:33:19 recht Exp $
+$NetBSD: distinfo,v 1.22 2004/12/30 21:56:20 minskim Exp $
 
 SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
 Size (Python-2.3.4.tgz) = 8502738 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
 SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
 SHA1 (patch-ah) = f9a46bfe82acec594cf44afd43f359a5248edadb
-SHA1 (patch-al) = af2c7c23a7aec7e305edb0ef41456c5247b87405
+SHA1 (patch-al) = a19c897aedd60e6a437042daf8141ace979774c5
 SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
 SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
 SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff
diff --git a/lang/python23/patches/patch-al b/lang/python23/patches/patch-al
index 432450c2bdd..e8192edfc4d 100644
--- a/lang/python23/patches/patch-al
+++ b/lang/python23/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
+$NetBSD: patch-al,v 1.9 2004/12/30 21:56:21 minskim Exp $
 
---- configure.orig	Fri May  7 21:13:40 2004
-+++ configure	Thu Nov 25 13:20:20 2004
-@@ -1440,6 +1440,8 @@
+--- configure.orig	2004-05-07 14:13:40.000000000 -0500
++++ configure
+@@ -1440,6 +1440,8 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[01234])
      define_xopen_source=no;;
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3603,7 +3605,7 @@
+@@ -3603,7 +3605,7 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3624,6 +3626,14 @@
+@@ -3624,6 +3626,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -35,7 +35,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
    esac
    # DG/UX requires some fancy ld contortions to produce a .so from an .a
    case $MACHDEP in
-@@ -4021,7 +4031,12 @@
+@@ -4021,7 +4031,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -49,7 +49,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
  	    ;;
      esac
      ;;
-@@ -10082,7 +10097,7 @@
+@@ -10082,7 +10097,7 @@ then
  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
@@ -58,7 +58,7 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
  		fi ;;
  	Darwin/*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10091,8 +10106,8 @@
+@@ -10091,10 +10106,10 @@ then
  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -67,9 +67,12 @@ $NetBSD: patch-al,v 1.8 2004/11/28 13:33:19 recht Exp $
 +			BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
 +			LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
  		fi ;;
- 	Linux*|GNU*) LDSHARED='$(CC) -shared';;
+-	Linux*|GNU*) LDSHARED='$(CC) -shared';;
++	Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
  	dgux*) LDSHARED="ld -G";;
-@@ -13855,6 +13870,7 @@
+ 	BSD/OS*/4*) LDSHARED="gcc -shared";;
+ 	OpenBSD*|FreeBSD*)
+@@ -13855,6 +13870,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"
diff --git a/lang/python24-pth/distinfo b/lang/python24-pth/distinfo
index 2179bc3ebb5..b6b813d9004 100644
--- a/lang/python24-pth/distinfo
+++ b/lang/python24-pth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/12/05 23:28:53 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/12/30 21:56:21 minskim Exp $
 
 SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e
 Size (Python-2.4.tar.bz2) = 7840762 bytes
@@ -13,6 +13,6 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = ebf8e77f67e69f6aec0b6da254e0169198f0ae8f
+SHA1 (patch-al) = 1a48a02ea72b99b4f942abc6c91ceab8fc2ba879
 SHA1 (patch-am) = ecb78cf1097531447af7b7fd60166b84b8aef1b4
 SHA1 (patch-ba) = d0f9d225bd3de0a7af098fef05d5b09f8319ce7f
diff --git a/lang/python24-pth/patches/patch-al b/lang/python24-pth/patches/patch-al
index 7d0a9f86c45..de8abeaeea3 100644
--- a/lang/python24-pth/patches/patch-al
+++ b/lang/python24-pth/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
+$NetBSD: patch-al,v 1.2 2004/12/30 21:56:21 minskim Exp $
 
---- configure.orig	Sun Nov  7 02:24:12 2004
-+++ configure	Sun Dec  5 23:03:58 2004
-@@ -1349,7 +1349,7 @@
+--- configure.orig	2004-11-06 19:24:12.000000000 -0600
++++ configure
+@@ -1349,7 +1349,7 @@ rm confdefs.h
  mv confdefs.h.new confdefs.h
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
  
  
  SOVERSION=1.0
-@@ -1479,6 +1479,8 @@
+@@ -1479,6 +1479,8 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[0123456])
      define_xopen_source=no;;
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3418,6 +3420,14 @@
+@@ -3418,6 +3420,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -35,7 +35,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
    esac
  else # shared is disabled
    case $ac_sys_system in
-@@ -3816,7 +3826,12 @@
+@@ -3816,7 +3826,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -49,7 +49,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
  	    ;;
      esac
      ;;
-@@ -10295,7 +10310,7 @@
+@@ -10295,7 +10310,7 @@ then
  			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
@@ -58,7 +58,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
  		fi ;;
  	Darwin/1.4*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10305,8 +10320,8 @@
+@@ -10305,8 +10320,8 @@ then
  			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -69,7 +69,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
  		fi ;;
  	Darwin/*)
  		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -10324,8 +10339,8 @@
+@@ -10324,12 +10339,12 @@ then
  				LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -80,7 +80,12 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
  			fi
  		fi
  		;;
-@@ -14297,6 +14312,7 @@
+-	Linux*|GNU*) LDSHARED='$(CC) -shared';;
++	Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
+ 	BSD/OS*/4*) LDSHARED="gcc -shared";;
+ 	OpenBSD*|FreeBSD*)
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+@@ -14297,6 +14312,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index eda9c92b571..da5f21e713e 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/12/19 05:45:39 grant Exp $
+$NetBSD: distinfo,v 1.4 2004/12/30 21:56:21 minskim Exp $
 
 SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e
 Size (Python-2.4.tar.bz2) = 7840762 bytes
@@ -13,5 +13,5 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = 789a62b0efa9044ea412d6e1ef47c62d9ea0ec1a
+SHA1 (patch-al) = 1b91dab1575079c70851150ff0e3ad3d45fe7123
 SHA1 (patch-am) = aa71ec2f9cc8f434ff38b19df23b5dd433e13e5a
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
index bd57078e583..0718eed750f 100644
--- a/lang/python24/patches/patch-al
+++ b/lang/python24/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.3 2004/12/19 05:45:39 grant Exp $
+$NetBSD: patch-al,v 1.4 2004/12/30 21:56:21 minskim Exp $
 
---- configure.orig	2004-11-07 12:24:12.000000000 +1100
+--- configure.orig	2004-11-06 19:24:12.000000000 -0600
 +++ configure
 @@ -1479,6 +1479,8 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
@@ -72,7 +72,7 @@ $NetBSD: patch-al,v 1.3 2004/12/19 05:45:39 grant Exp $
  		fi ;;
  	Darwin/*)
  		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -10324,8 +10342,8 @@ then
+@@ -10324,12 +10342,12 @@ then
  				LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -83,6 +83,11 @@ $NetBSD: patch-al,v 1.3 2004/12/19 05:45:39 grant Exp $
  			fi
  		fi
  		;;
+-	Linux*|GNU*) LDSHARED='$(CC) -shared';;
++	Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
+ 	BSD/OS*/4*) LDSHARED="gcc -shared";;
+ 	OpenBSD*|FreeBSD*)
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
 @@ -10370,6 +10388,7 @@ then
  		 fi;;
  	Linux*|GNU*) CCSHARED="-fPIC";;