Allow Python 2.3 to build dynamic modules on DragonFly.

2 files changed, 26 insertions, 18 deletions

diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 960d3a73733..7d8bc3d6a65 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2005/07/29 13:27:26 drochner Exp $
+$NetBSD: distinfo,v 1.33 2005/09/21 09:39:26 joerg Exp $
 
 SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
 RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
@@ -9,7 +9,7 @@ SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
 SHA1 (patch-af) = cb01cc38f84dfe353c8b9988aa8a03ab4ef61012
 SHA1 (patch-ah) = 6740fb09c3a1fca8cd25642a683d65d6d66760f8
-SHA1 (patch-al) = c96a93c03b68c35fc9797c442d6400d289e1aa20
+SHA1 (patch-al) = 98818fe37c3bac94bee91fe4f3dd8633172bec49
 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 fe431ef4aed..ecd7d26b7f9 100644
--- a/lang/python23/patches/patch-al
+++ b/lang/python23/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
+$NetBSD: patch-al,v 1.14 2005/09/21 09:39:27 joerg Exp $
 
 --- configure.orig	2005-01-11 14:48:52.000000000 +0100
 +++ configure	2005-07-01 15:27:58.000000000 +0200
-@@ -1481,6 +1481,8 @@
+@@ -1481,6 +1481,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.13 2005/07/03 19:49:06 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -1498,13 +1500,18 @@
+@@ -1498,13 +1500,18 @@ case $ac_sys_system/$ac_sys_release in
    # it craps out if _XOPEN_EXTENDED_SOURCE is defined. Apparently,
    # this is fixed in 10.3, which identifies itself as Darwin/7.*
    # This should hopefully be fixed in FreeBSD 4.9
@@ -31,16 +31,16 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
  esac
  
  if test $define_xopen_source = yes
-@@ -3733,7 +3740,7 @@
+@@ -3733,7 +3740,7 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
 -    Linux*|GNU*|NetBSD*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*)
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3754,6 +3761,14 @@
+@@ -3754,6 +3761,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -55,7 +55,7 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
    esac
    # DG/UX requires some fancy ld contortions to produce a .so from an .a
    case $MACHDEP in
-@@ -4152,7 +4167,12 @@
+@@ -4152,7 +4167,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -69,7 +69,7 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
  	    ;;
      esac
      ;;
-@@ -10979,7 +10999,7 @@
+@@ -10979,7 +10999,7 @@ then
  			LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
@@ -78,7 +78,7 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
  		fi ;;
  	Darwin/1.4*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -11009,12 +11029,12 @@
+@@ -11009,12 +11029,12 @@ then
  				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -94,25 +94,33 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
  	dgux*) LDSHARED="ld -G";;
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
  	OpenBSD*|FreeBSD*)
-@@ -11024,7 +11044,8 @@
+@@ -11024,7 +11044,8 @@ then
  		else
  			LDSHARED="ld -Bshareable ${LDFLAGS}"
  		fi;;
 -	NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
-+	NetBSD*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
++	NetBSD*|DragonFly*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
 +	Interix*) LDSHARED='$(CC) -shared ${LDFLAGS}';; # XXX tv needs image-base hack
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then LDSHARED='$(CC) -shared'
-@@ -11057,6 +11078,7 @@
+@@ -11056,7 +11077,8 @@ then
+ 		 fi;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
- 	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
+-	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
++	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
 +	Interix*) CCSHARED="";;
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -11116,6 +11138,7 @@
+@@ -11111,11 +11133,12 @@ then
+ 	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
+ 	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
+ 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
+-	FreeBSD*|NetBSD*|OpenBSD*)
++	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -120,7 +128,7 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
  	SunOS/5*) case $CC in
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -13357,7 +13380,7 @@
+@@ -13357,7 +13380,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
  		       ;;
@@ -129,7 +137,7 @@ $NetBSD: patch-al,v 1.13 2005/07/03 19:49:06 recht Exp $
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_BROKEN_POSIX_SEMAPHORES 1
  _ACEOF
-@@ -15127,6 +15150,7 @@
+@@ -15127,6 +15150,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"