Skip to content

Commit ba1016e

Browse files
author
ronald.oussoren
committed
Merged revisions 74682 via svnmerge from
svn+ssh://[email protected]/python/branches/py3k ................ r74682 | ronald.oussoren | 2009-09-06 13:01:15 +0200 (Sun, 06 Sep 2009) | 9 lines Merged revisions 74672 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r74672 | ronald.oussoren | 2009-09-06 12:00:26 +0200 (Sun, 06 Sep 2009) | 1 line Fix build issues on OSX 10.6 (issue 6802) ........ ................ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74683 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent d9a7527 commit ba1016e

3 files changed

Lines changed: 186 additions & 33 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ Extension Modules
134134
Build
135135
-----
136136

137+
- Issue #6802: Fix build issues on MacOSX 10.6
138+
137139
- Issue 4601: 'make install' did not set the appropriate permissions on
138140
directories.
139141

‎configure‎

Lines changed: 122 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 73274 .
2+
# From configure.in Revision: 73307 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.1.
55
#
@@ -1908,7 +1908,6 @@ fi
19081908

19091909

19101910

1911-
ARCH_RUN_32BIT=
19121911

19131912

19141913
UNIVERSAL_ARCHS="32-bit"
@@ -3806,7 +3805,7 @@ else
38063805
{ echo "$as_me:$LINENO: result: no" >&5
38073806
echo "${ECHO_T}no" >&6; }
38083807
fi
3809-
rm -f conftest*
3808+
rm -f -r conftest*
38103809

38113810

38123811

@@ -4649,6 +4648,7 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
46494648

46504649
elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
46514650
UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
4651+
ARCH_RUN_32BIT="true"
46524652

46534653
elif test "$UNIVERSAL_ARCHS" = "all" ; then
46544654
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
@@ -4674,12 +4674,22 @@ echo "$as_me: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&2
46744674
cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
46754675
if test ${cur_target} '>' 10.2; then
46764676
cur_target=10.3
4677-
fi
4678-
if test "${UNIVERSAL_ARCHS}" = "all"; then
4679-
# Ensure that the default platform for a 4-way
4680-
# universal build is OSX 10.5, that's the first
4681-
# OS release where 4-way builds make sense.
4682-
cur_target='10.5'
4677+
if test ${enable_universalsdk}; then
4678+
if test "${UNIVERSAL_ARCHS}" = "all"; then
4679+
# Ensure that the default platform for a
4680+
# 4-way universal build is OSX 10.5,
4681+
# that's the first OS release where
4682+
# 4-way builds make sense.
4683+
cur_target='10.5'
4684+
fi
4685+
else
4686+
if test `arch` = "i386"; then
4687+
# On Intel macs default to a deployment
4688+
# target of 10.4, that's the first OSX
4689+
# release with Intel support.
4690+
cur_target="10.4"
4691+
fi
4692+
fi
46834693
fi
46844694
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
46854695

@@ -5341,7 +5351,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
53415351
else
53425352
ac_cv_header_stdc=no
53435353
fi
5344-
rm -f conftest*
5354+
rm -f -r conftest*
53455355

53465356
fi
53475357

@@ -5362,7 +5372,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
53625372
else
53635373
ac_cv_header_stdc=no
53645374
fi
5365-
rm -f conftest*
5375+
rm -f -r conftest*
53665376

53675377
fi
53685378

@@ -6460,7 +6470,7 @@ _ACEOF
64606470

64616471

64626472
fi
6463-
rm -f conftest*
6473+
rm -f -r conftest*
64646474

64656475
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
64666476
echo "${ECHO_T}$was_it_defined" >&6; }
@@ -6990,7 +7000,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
69907000
else
69917001
ac_cv_type_uid_t=no
69927002
fi
6993-
rm -f conftest*
7003+
rm -f -r conftest*
69947004

69957005
fi
69967006
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -13249,13 +13259,15 @@ case $ac_sys_system/$ac_sys_release in
1324913259
esac
1325013260

1325113261

13262+
ARCH_RUN_32BIT=""
13263+
1325213264
case $ac_sys_system/$ac_sys_release in
1325313265
Darwin/[01567]\..*)
1325413266
LIBTOOL_CRUFT="-framework System -lcc_dynamic"
1325513267
if test "${enable_universalsdk}"; then
1325613268
:
1325713269
else
13258-
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
13270+
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
1325913271
fi
1326013272
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
1326113273
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -13267,7 +13279,93 @@ case $ac_sys_system/$ac_sys_release in
1326713279
else
1326813280
LIBTOOL_CRUFT=""
1326913281
fi
13270-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
13282+
if test "$cross_compiling" = yes; then
13283+
ac_osx_32bit=no
13284+
else
13285+
cat >conftest.$ac_ext <<_ACEOF
13286+
/* confdefs.h. */
13287+
_ACEOF
13288+
cat confdefs.h >>conftest.$ac_ext
13289+
cat >>conftest.$ac_ext <<_ACEOF
13290+
/* end confdefs.h. */
13291+
[
13292+
#include <unistd.h>
13293+
int main(int argc, char*argv[])
13294+
{
13295+
if (sizeof(long) == 4) {
13296+
return 0;
13297+
} else {
13298+
return 1;
13299+
}
13300+
]
13301+
_ACEOF
13302+
rm -f conftest$ac_exeext
13303+
if { (ac_try="$ac_link"
13304+
case "(($ac_try" in
13305+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13306+
*) ac_try_echo=$ac_try;;
13307+
esac
13308+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13309+
(eval "$ac_link") 2>&5
13310+
ac_status=$?
13311+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13312+
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13313+
{ (case "(($ac_try" in
13314+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13315+
*) ac_try_echo=$ac_try;;
13316+
esac
13317+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13318+
(eval "$ac_try") 2>&5
13319+
ac_status=$?
13320+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13321+
(exit $ac_status); }; }; then
13322+
ac_osx_32bit=yes
13323+
else
13324+
echo "$as_me: program exited with status $ac_status" >&5
13325+
echo "$as_me: failed program was:" >&5
13326+
sed 's/^/| /' conftest.$ac_ext >&5
13327+
13328+
( exit $ac_status )
13329+
ac_osx_32bit=no
13330+
fi
13331+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13332+
fi
13333+
13334+
13335+
13336+
if test "${ac_osx_32bit}" = "yes"; then
13337+
case `arch` in
13338+
i386)
13339+
MACOSX_DEFAULT_ARCH="i386"
13340+
;;
13341+
ppc)
13342+
MACOSX_DEFAULT_ARCH="ppc"
13343+
;;
13344+
*)
13345+
{ { echo "$as_me:$LINENO: error: Unexpected output of 'arch' on OSX" >&5
13346+
echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
13347+
{ (exit 1); exit 1; }; }
13348+
;;
13349+
esac
13350+
else
13351+
case `arch` in
13352+
i386)
13353+
MACOSX_DEFAULT_ARCH="x86_64"
13354+
;;
13355+
ppc)
13356+
MACOSX_DEFAULT_ARCH="ppc64"
13357+
;;
13358+
*)
13359+
{ { echo "$as_me:$LINENO: error: Unexpected output of 'arch' on OSX" >&5
13360+
echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
13361+
{ (exit 1); exit 1; }; }
13362+
;;
13363+
esac
13364+
13365+
#ARCH_RUN_32BIT="true"
13366+
fi
13367+
13368+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
1327113369
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
1327213370
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
1327313371
esac
@@ -14313,7 +14411,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1431314411
else
1431414412
unistd_defines_pthreads=no
1431514413
fi
14316-
rm -f conftest*
14414+
rm -f -r conftest*
1431714415

1431814416
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
1431914417
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -15781,7 +15879,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1578115879
$EGREP "yes" >/dev/null 2>&1; then
1578215880
ipv6type=$i
1578315881
fi
15784-
rm -f conftest*
15882+
rm -f -r conftest*
1578515883

1578615884
;;
1578715885
kame)
@@ -15804,7 +15902,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1580415902
ipv6libdir=/usr/local/v6/lib
1580515903
ipv6trylibc=yes
1580615904
fi
15807-
rm -f conftest*
15905+
rm -f -r conftest*
1580815906

1580915907
;;
1581015908
linux-glibc)
@@ -15825,7 +15923,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1582515923
ipv6type=$i;
1582615924
ipv6trylibc=yes
1582715925
fi
15828-
rm -f conftest*
15926+
rm -f -r conftest*
1582915927

1583015928
;;
1583115929
linux-inet6)
@@ -15863,7 +15961,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1586315961
ipv6lib=inet6;
1586415962
ipv6libdir=/usr/local/v6/lib
1586515963
fi
15866-
rm -f conftest*
15964+
rm -f -r conftest*
1586715965

1586815966
;;
1586915967
v6d)
@@ -15886,7 +15984,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1588615984
ipv6libdir=/usr/local/v6/lib;
1588715985
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
1588815986
fi
15889-
rm -f conftest*
15987+
rm -f -r conftest*
1589015988

1589115989
;;
1589215990
zeta)
@@ -15908,7 +16006,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1590816006
ipv6lib=inet6;
1590916007
ipv6libdir=/usr/local/v6/lib
1591016008
fi
15911-
rm -f conftest*
16009+
rm -f -r conftest*
1591216010

1591316011
;;
1591416012
esac
@@ -23893,7 +23991,7 @@ cat >>confdefs.h <<\_ACEOF
2389323991
_ACEOF
2389423992

2389523993
fi
23896-
rm -f conftest*
23994+
rm -f -r conftest*
2389723995

2389823996
fi
2389923997

@@ -24163,7 +24261,7 @@ cat >>confdefs.h <<\_ACEOF
2416324261
_ACEOF
2416424262

2416524263
fi
24166-
rm -f conftest*
24264+
rm -f -r conftest*
2416724265

2416824266
fi
2416924267

0 commit comments

Comments
 (0)