[Python-checkins] r46609 - in python/branches/release24-maint: Misc/NEWS configure configure.in

Sat Jun 3 09:40:05 CEST 2006

Author: martin.v.loewis
Date: Sat Jun 3 09:40:03 2006
New Revision: 46609
Modified:
 python/branches/release24-maint/Misc/NEWS
 python/branches/release24-maint/configure
 python/branches/release24-maint/configure.in
Log:
Backport of 46608: Port to OpenBSD 3.9.
Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================

--- python/branches/release24-maint/Misc/NEWS	(original)
+++ python/branches/release24-maint/Misc/NEWS	Sat Jun 3 09:40:03 2006
@@ -60,6 +60,8 @@
 Build
 -----
 
+- OpenBSD 3.9 is now supported.
+
 - Test for sys/statvfs.h before including it, as statvfs is present
 on some OSX installation, but its header file is not.
 
Modified: python/branches/release24-maint/configure
==============================================================================
--- python/branches/release24-maint/configure	(original)
+++ python/branches/release24-maint/configure	Sat Jun 3 09:40:03 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 43618 .
+# From configure.in Revision: 46011 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -1480,7 +1480,7 @@
 # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
 # even though select is a POSIX function. Reported by J. Ribbens.
 # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
- OpenBSD/2.* | OpenBSD/3.[012345678])
+ OpenBSD/2.* | OpenBSD/3.[0123456789])
 define_xopen_source=no;;
 # On Solaris 2.6, sys/wait.h is inconsistent in the usage
 # of union __?sigval. Reported by Stuart Bishop.
@@ -10386,13 +10386,27 @@
 		;;
 	Linux*|GNU*) LDSHARED='$(CC) -shared';;
 	BSD/OS*/4*) LDSHARED="gcc -shared";;
-	OpenBSD*|FreeBSD*)
+	FreeBSD*)
 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
 		then
 			LDSHARED="$CC -shared ${LDFLAGS}"
 		else
 			LDSHARED="ld -Bshareable ${LDFLAGS}"
 		fi;;
+	OpenBSD*)
+		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+		then
+				LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+		else
+				case `uname -r` in
+				[01].* | 2.[0-7] | 2.[0-7].*)
+				 LDSHARED="ld -Bshareable ${LDFLAGS}"
+				 ;;
+				*)
+				 LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+				 ;;
+				esac
+		fi;;
 	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
 	OpenUNIX*|UnixWare*)
 		if test "$GCC" = "yes"
Modified: python/branches/release24-maint/configure.in
==============================================================================
--- python/branches/release24-maint/configure.in	(original)
+++ python/branches/release24-maint/configure.in	Sat Jun 3 09:40:03 2006
@@ -140,7 +140,7 @@
 # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
 # even though select is a POSIX function. Reported by J. Ribbens.
 # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
- OpenBSD/2.* | OpenBSD/3.@<:@012345678@:>@) 
+ OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@) 
 define_xopen_source=no;;
 # On Solaris 2.6, sys/wait.h is inconsistent in the usage
 # of union __?sigval. Reported by Stuart Bishop.
@@ -1385,13 +1385,27 @@
 		;;
 	Linux*|GNU*) LDSHARED='$(CC) -shared';;
 	BSD/OS*/4*) LDSHARED="gcc -shared";;
-	OpenBSD*|FreeBSD*)
+	FreeBSD*)
 		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
 		then
 			LDSHARED="$CC -shared ${LDFLAGS}"
 		else
 			LDSHARED="ld -Bshareable ${LDFLAGS}"
 		fi;;
+	OpenBSD*)
+		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+		then
+				LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+		else
+				case `uname -r` in
+				[[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
+				 LDSHARED="ld -Bshareable ${LDFLAGS}"
+				 ;;
+				*)
+				 LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+				 ;;
+				esac
+		fi;;
 	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
 	OpenUNIX*|UnixWare*)
 		if test "$GCC" = "yes"
