[Python-checkins] r74683 - in python/branches/release31-maint: Misc/NEWS configure configure.in

Sun Sep 6 13:11:05 CEST 2009

Author: ronald.oussoren
Date: Sun Sep 6 13:11:04 2009
New Revision: 74683
Log:
Merged revisions 74682 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r74682 | ronald.oussoren | 2009年09月06日 13:01:15 +0200 (2009年9月06日) | 9 lines
 
 Merged revisions 74672 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r74672 | ronald.oussoren | 2009年09月06日 12:00:26 +0200 (2009年9月06日) | 1 line
 
 Fix build issues on OSX 10.6 (issue 6802)
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Misc/NEWS
 python/branches/release31-maint/configure
 python/branches/release31-maint/configure.in
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================

--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Sep 6 13:11:04 2009
@@ -134,6 +134,8 @@
 Build
 -----
 
+- Issue #6802: Fix build issues on MacOSX 10.6
+
 - Issue 4601: 'make install' did not set the appropriate permissions on
 directories.
 
Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Sun Sep 6 13:11:04 2009
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 73274 .
+# From configure.in Revision: 73307 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -1908,7 +1908,6 @@
 
 
 
-ARCH_RUN_32BIT=
 
 
 UNIVERSAL_ARCHS="32-bit"
@@ -3806,7 +3805,7 @@
 { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 
 
@@ -4649,6 +4648,7 @@
 
 	 elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
 		 UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
+		 ARCH_RUN_32BIT="true"
 
 	 elif test "$UNIVERSAL_ARCHS" = "all" ; then
 		 UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
@@ -4674,12 +4674,22 @@
 	 cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/1円/'`
 	 if test ${cur_target} '>' 10.2; then
 		 cur_target=10.3
-	 fi
-	 if test "${UNIVERSAL_ARCHS}" = "all"; then
-		 # Ensure that the default platform for a 4-way
-		 # universal build is OSX 10.5, that's the first
-		 # OS release where 4-way builds make sense.
-		 cur_target='10.5'
+		 if test ${enable_universalsdk}; then
+			 if test "${UNIVERSAL_ARCHS}" = "all"; then
+				 # Ensure that the default platform for a
+				 # 4-way universal build is OSX 10.5,
+				 # that's the first OS release where
+				 # 4-way builds make sense.
+				 cur_target='10.5'
+			 fi
+		 else
+			 if test `arch` = "i386"; then
+				 # On Intel macs default to a deployment
+				 # target of 10.4, that's the first OSX
+				 # release with Intel support.
+				 cur_target="10.4"
+			 fi
+		 fi
 	 fi
 	 CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
 
@@ -5341,7 +5351,7 @@
 else
 ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -5362,7 +5372,7 @@
 else
 ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -6460,7 +6470,7 @@
 
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
 echo "${ECHO_T}$was_it_defined" >&6; }
@@ -6990,7 +7000,7 @@
 else
 ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -13249,13 +13259,15 @@
 esac
 
 
+ARCH_RUN_32BIT=""
+
 case $ac_sys_system/$ac_sys_release in
 Darwin/[01567]\..*)
 LIBTOOL_CRUFT="-framework System -lcc_dynamic"
 if test "${enable_universalsdk}"; then
 	 :
 else
-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
 fi
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -13267,7 +13279,93 @@
 else
 LIBTOOL_CRUFT=""
 fi
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
+ if test "$cross_compiling" = yes; then
+ ac_osx_32bit=no
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+[
+ #include <unistd.h>
+ int main(int argc, char*argv[])
+ {
+ if (sizeof(long) == 4) {
+ 	 return 0;
+ } else {
+ 	 return 1;
+ }
+ ]
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_osx_32bit=yes
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_osx_32bit=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+ if test "${ac_osx_32bit}" = "yes"; then
+ 	case `arch` in
+ 	i386)
+ 		MACOSX_DEFAULT_ARCH="i386"
+ 		;;
+ 	ppc)
+ 		MACOSX_DEFAULT_ARCH="ppc"
+ 		;;
+ 	*)
+ 		{ { echo "$as_me:$LINENO: error: Unexpected output of 'arch' on OSX" >&5
+echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
+ { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+ else
+ 	case `arch` in
+ 	i386)
+ 		MACOSX_DEFAULT_ARCH="x86_64"
+ 		;;
+ 	ppc)
+ 		MACOSX_DEFAULT_ARCH="ppc64"
+ 		;;
+ 	*)
+ 		{ { echo "$as_me:$LINENO: error: Unexpected output of 'arch' on OSX" >&5
+echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
+ { (exit 1); exit 1; }; }
+ 		;;
+ 	esac
+
+	#ARCH_RUN_32BIT="true"
+ fi
+
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
@@ -14313,7 +14411,7 @@
 else
 unistd_defines_pthreads=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
 echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -15781,7 +15879,7 @@
 $EGREP "yes" >/dev/null 2>&1; then
 ipv6type=$i
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		kame)
@@ -15804,7 +15902,7 @@
 				ipv6libdir=/usr/local/v6/lib
 				ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		linux-glibc)
@@ -15825,7 +15923,7 @@
 ipv6type=$i;
 				ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		linux-inet6)
@@ -15863,7 +15961,7 @@
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		v6d)
@@ -15886,7 +15984,7 @@
 				ipv6libdir=/usr/local/v6/lib;
 				BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		zeta)
@@ -15908,7 +16006,7 @@
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		esac
@@ -23893,7 +23991,7 @@
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -24163,7 +24261,7 @@
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Sun Sep 6 13:11:04 2009
@@ -101,7 +101,6 @@
 ])
 AC_SUBST(UNIVERSALSDK)
 
-ARCH_RUN_32BIT=
 AC_SUBST(ARCH_RUN_32BIT)
 
 UNIVERSAL_ARCHS="32-bit"
@@ -911,6 +910,7 @@
 
 	 elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
 		 UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
+		 ARCH_RUN_32BIT="true"
 
 	 elif test "$UNIVERSAL_ARCHS" = "all" ; then
 		 UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
@@ -934,12 +934,22 @@
 	 cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/1円/'`
 	 if test ${cur_target} '>' 10.2; then
 		 cur_target=10.3
-	 fi
-	 if test "${UNIVERSAL_ARCHS}" = "all"; then
-		 # Ensure that the default platform for a 4-way
-		 # universal build is OSX 10.5, that's the first
-		 # OS release where 4-way builds make sense.
-		 cur_target='10.5'
+		 if test ${enable_universalsdk}; then
+			 if test "${UNIVERSAL_ARCHS}" = "all"; then
+				 # Ensure that the default platform for a 
+				 # 4-way universal build is OSX 10.5, 
+				 # that's the first OS release where 
+				 # 4-way builds make sense.
+				 cur_target='10.5'
+			 fi
+		 else
+			 if test `arch` = "i386"; then
+				 # On Intel macs default to a deployment
+				 # target of 10.4, that's the first OSX
+				 # release with Intel support.
+				 cur_target="10.4"
+			 fi
+		 fi
 	 fi
 	 CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
 	 
@@ -1488,6 +1498,8 @@
 ;;
 esac
 
+
+ARCH_RUN_32BIT=""
 AC_SUBST(LIBTOOL_CRUFT)
 case $ac_sys_system/$ac_sys_release in
 Darwin/@<:@01567@:>@\..*) 
@@ -1495,7 +1507,7 @@
 if test "${enable_universalsdk}"; then
 	 :
 else
-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
 fi
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -1507,7 +1519,48 @@
 else 
 LIBTOOL_CRUFT=""
 fi
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
+ AC_TRY_RUN([[
+ #include <unistd.h>
+ int main(int argc, char*argv[])
+ {
+ if (sizeof(long) == 4) {
+ 	 return 0;
+ } else {
+ 	 return 1;
+ }
+ ]], ac_osx_32bit=yes,
+ ac_osx_32bit=no,
+ ac_osx_32bit=no)
+ 
+ if test "${ac_osx_32bit}" = "yes"; then
+ 	case `arch` in
+ 	i386) 
+ 		MACOSX_DEFAULT_ARCH="i386" 
+ 		;;
+ 	ppc) 
+ 		MACOSX_DEFAULT_ARCH="ppc" 
+ 		;;
+ 	*)
+ 		AC_MSG_ERROR([Unexpected output of 'arch' on OSX])
+ 		;;
+ 	esac
+ else
+ 	case `arch` in
+ 	i386) 
+ 		MACOSX_DEFAULT_ARCH="x86_64" 
+ 		;;
+ 	ppc) 
+ 		MACOSX_DEFAULT_ARCH="ppc64" 
+ 		;;
+ 	*)
+ 		AC_MSG_ERROR([Unexpected output of 'arch' on OSX])
+ 		;;
+ 	esac
+
+	#ARCH_RUN_32BIT="true"
+ fi
+
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
 LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
