mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Forward port a number of OSX bugfixes from the trunk to 3.2

Browse source
This commit is contained in:
Ronald Oussoren 2010-02-07 19:56:39 +00:00
parent a5336b6000
commit 755740f3ea
6 changed files with 104 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

38
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 78066 .
# From configure.in Revision: 78073 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@ -4640,6 +4640,38 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
ARCH_RUN_32BIT=""
LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
# You have to use different flags on various versions of
# OSX to extract PPC code from an universal binary, basically
# '-arch ppc' on OSX 10.4 and '-arch ppc7400' on anything
# newer.
# Because '-arch pp7400' works on OSX 10.5 or higher this
# test is only present in the '32-bit' branch, all other
# branches require OSX 10.5 to compile.
{ echo "$as_me:$LINENO: checking lipo flag for extracting ppc code" >&5
echo $ECHO_N "checking lipo flag for extracting ppc code... $ECHO_C" >&6; }
FN="test.$$"
cat >${FN}.c <<-EOF
int main() { return 0; }
EOF
${CC} ${CFLAGS} -arch ppc -arch i386 -o ${FN} ${FN}.c -isysroot ${UNIVERSALSDK}
if test $? != 0 ; then
rm ${FN} ${FN}.c
{ echo "$as_me:$LINENO: result: failed, assumee -extract ppc7400" >&5
echo "${ECHO_T}failed, assumee -extract ppc7400" >&6; }
else
lipo "${FN}" -extract ppc7400 -output "${FN}.out" 2>/dev/null
if test $? != 0 ; then
LIPO_32BIT_FLAGS="-extract ppc -extract i386"
{ echo "$as_me:$LINENO: result: \"'-extract ppc'\"" >&5
echo "${ECHO_T}\"'-extract ppc'\"" >&6; }
else
{ echo "$as_me:$LINENO: result: \"'-extract ppc7400'\"" >&5
echo "${ECHO_T}\"'-extract ppc7400'\"" >&6; }
fi
rm -f ${FN} ${FN}.c ${FN}.out
fi
elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
LIPO_32BIT_FLAGS=""
@ -5586,6 +5618,8 @@ done
@ -5600,7 +5634,7 @@ sys/param.h sys/poll.h sys/select.h sys/socket.h sys/statvfs.h sys/stat.h \
sys/termio.h sys/time.h \
sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
bluetooth/bluetooth.h linux/tipc.h
bluetooth/bluetooth.h linux/tipc.h spawn.h util.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then