Backport from Python-2.4 a configure condition that prevents

_POSIX_C_SOURCE from being defined on Darwin-8.x.  This makes the
package build on Darwin-8.x.

2 files changed, 22 insertions, 10 deletions

diff --git a/lang/python23-nth/distinfo b/lang/python23-nth/distinfo
index 381fba6c8be..afbf773025b 100644
--- a/lang/python23-nth/distinfo
+++ b/lang/python23-nth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/06/16 12:45:27 hira Exp $
+$NetBSD: distinfo,v 1.5 2005/06/30 03:12:42 minskim 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) = 35d27825ea4f3930cce651761e192a7302696eba
 SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
 SHA1 (patch-ah) = da362d3e2e46077c3177796f0c926661b0f751d4
-SHA1 (patch-al) = fa8c2ea3a7ae2569920f1f7948ec417ecf11515d
+SHA1 (patch-al) = 653c7930f3708b418ccfe202a25c1a8eef70da48
 SHA1 (patch-am) = 6d5d24b5a58bd577e8b88527793b27e624455643
 SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
 SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
diff --git a/lang/python23-nth/patches/patch-al b/lang/python23-nth/patches/patch-al
index eb1cd706224..edaa2d2890c 100644
--- a/lang/python23-nth/patches/patch-al
+++ b/lang/python23-nth/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
+$NetBSD: patch-al,v 1.3 2005/06/30 03:12:42 minskim Exp $
 
---- configure.orig	2005-01-11 14:48:52.000000000 +0100
+--- configure.orig	2005-01-11 07:48:52.000000000 -0600
 +++ configure
 @@ -1351,7 +1351,7 @@ rm confdefs.h
  mv confdefs.h.new confdefs.h
@@ -20,7 +20,19 @@ $NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3733,7 +3735,7 @@ _ACEOF
+@@ -1505,6 +1507,11 @@ case $ac_sys_system/$ac_sys_release in
+   # has another value. By not (re)defining it, the defaults come in place.
+   AIX/4)
+     define_xopen_source=no;;
++  # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
++  # disables platform specific features beyond repair.
++  Darwin/8.*)
++    define_xopen_source=no
++    ;;
+ esac
+ 
+ if test $define_xopen_source = yes
+@@ -3733,7 +3740,7 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -29,7 +41,7 @@ $NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3754,6 +3756,14 @@ _ACEOF
+@@ -3754,6 +3761,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -44,7 +56,7 @@ $NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
    esac
    # DG/UX requires some fancy ld contortions to produce a .so from an .a
    case $MACHDEP in
-@@ -4152,7 +4162,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
+@@ -4152,7 +4167,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -58,7 +70,7 @@ $NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
  	    ;;
      esac
      ;;
-@@ -10979,7 +10994,7 @@ then
+@@ -10979,7 +10999,7 @@ then
  			LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
@@ -67,7 +79,7 @@ $NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
  		fi ;;
  	Darwin/1.4*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -11009,12 +11024,12 @@ then
+@@ -11009,12 +11029,12 @@ then
  				LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -83,7 +95,7 @@ $NetBSD: patch-al,v 1.2 2005/02/15 12:25:07 drochner Exp $
  	dgux*) LDSHARED="ld -G";;
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
  	OpenBSD*|FreeBSD*)
-@@ -15127,6 +15142,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -15127,6 +15147,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"