Teach configure about SunOS 5.11, preventing some pyconfig.h weirdness.

4 files changed, 62 insertions, 10 deletions

diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 4391fd399eb..f24409e4a6b 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/06/04 05:08:19 obache Exp $
+$NetBSD: distinfo,v 1.17 2011/09/14 17:06:32 hans Exp $
 
 SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699
 RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22
@@ -14,7 +14,7 @@ SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
 SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1
 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
 SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
-SHA1 (patch-al) = 6247e3f85d555bae7850befbd7bfffbb233cecb3
+SHA1 (patch-al) = a4e28f73d8da2f83fcfbb5daec8d7c2c5bb4ff7f
 SHA1 (patch-am) = d2e59cbc21542c436f1b1957e6089b4cda21ef8b
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
diff --git a/lang/python25/patches/patch-al b/lang/python25/patches/patch-al
index f69a242a6f7..af61de1d50e 100644
--- a/lang/python25/patches/patch-al
+++ b/lang/python25/patches/patch-al
@@ -1,7 +1,33 @@
-$NetBSD: patch-al,v 1.5 2009/04/11 19:42:23 snj Exp $
+$NetBSD: patch-al,v 1.6 2011/09/14 17:06:32 hans Exp $
 
---- configure.orig	2008-12-13 06:13:52.000000000 -0800
-+++ configure	2009-03-20 14:28:16.000000000 -0700
+--- configure.orig	2011-09-07 15:28:20.710346391 +0200
++++ configure	2011-09-07 15:30:02.126868889 +0200
+@@ -2058,10 +2058,10 @@ if test $define_xopen_source = yes
+ then
+   # On Solaris w/ g++ it appears that _XOPEN_SOURCE has to be
+   # defined precisely as g++ defines it
+-  # Furthermore, on Solaris 10, XPG6 requires the use of a C99
++  # Furthermore, on Solaris >10, XPG6 requires the use of a C99
+   # compiler
+   case $ac_sys_system/$ac_sys_release in
+-    SunOS/5.8|SunOS/5.9|SunOS/5.10)
++    SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11)
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define _XOPEN_SOURCE 500
+@@ -2081,10 +2081,10 @@ _ACEOF
+   # definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else
+   # several APIs are not declared. Since this is also needed in some
+   # cases for HP-UX, we define it globally.
+-  # except for Solaris 10, where it must not be defined,
++  # except for Solaris >10, where it must not be defined,
+   # as it implies XPG4.2
+   case $ac_sys_system/$ac_sys_release in
+-    SunOS/5.10)
++    SunOS/5.10|SunOS/5.11)
+       ;;
+     *)
+ 
 @@ -4014,17 +4014,18 @@ _ACEOF
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index ccec2e899a6..b8d9f9f0536 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2011/09/12 20:14:06 bsiegert Exp $
+$NetBSD: distinfo,v 1.36 2011/09/14 17:07:01 hans Exp $
 
 SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa
 RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063
@@ -10,7 +10,7 @@ SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
-SHA1 (patch-al) = cbecd618884e9cfa3ff94645db6b6dd4566a9209
+SHA1 (patch-al) = e18800d53de022e4c24055f7d03b69af2837b089
 SHA1 (patch-am) = 60c108d05a16c531ee6cf99e5c7ad9a5f27c5f01
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al
index 59ed2a244b7..e12c3102550 100644
--- a/lang/python26/patches/patch-al
+++ b/lang/python26/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.8 2011/09/12 20:14:06 bsiegert Exp $
+$NetBSD: patch-al,v 1.9 2011/09/14 17:07:01 hans Exp $
 
---- configure.orig	Tue May 25 02:26:39 2010
-+++ configure
+--- configure.orig	2010-05-25 02:27:03.000000000 +0000
++++ configure	2011-09-06 18:58:15.336443123 +0200
 @@ -2833,7 +2833,7 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    # In addition, Stefan Krah confirms that issue #1244610 exists through
@@ -11,6 +11,32 @@ $NetBSD: patch-al,v 1.8 2011/09/12 20:14:06 bsiegert Exp $
      define_xopen_source=no
      # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
      # also defined. This can be overridden by defining _BSD_SOURCE
+@@ -2905,10 +2905,10 @@ if test $define_xopen_source = yes
+ then
+   # On Solaris w/ g++ it appears that _XOPEN_SOURCE has to be
+   # defined precisely as g++ defines it
+-  # Furthermore, on Solaris 10, XPG6 requires the use of a C99
++  # Furthermore, on Solaris >=10, XPG6 requires the use of a C99
+   # compiler
+   case $ac_sys_system/$ac_sys_release in
+-    SunOS/5.8|SunOS/5.9|SunOS/5.10)
++    SunOS/5.8|SunOS/5.9|SunOS/5.10|SunOS/5.11)
+ 
+ $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+ 
+@@ -2924,10 +2924,10 @@ $as_echo "#define _XOPEN_SOURCE 600" >>c
+   # definition of _XOPEN_SOURCE_EXTENDED and _POSIX_C_SOURCE, or else
+   # several APIs are not declared. Since this is also needed in some
+   # cases for HP-UX, we define it globally.
+-  # except for Solaris 10, where it must not be defined,
++  # except for Solaris >=10, where it must not be defined,
+   # as it implies XPG4.2
+   case $ac_sys_system/$ac_sys_release in
+-    SunOS/5.10)
++    SunOS/5.10|SunOS/5.11)
+       ;;
+     *)
+ 
 @@ -4736,15 +4736,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION