(Slightly modified) patch by Steve Spicklemire to make Python build

out of the box on OSX 10.1. Untested by me (except for not having adverse
effects on 10.0.4) but it looks good, for now. Eventually we should not
trigger on the darwin version but test for something, but until I have
the time to install 10.1 myself I have no clue what to test on.

It would be nice if this got in to the 2.2a3 distribution.
This commit is contained in:
Jack Jansen 2001-09-07 14:25:12 +00:00
parent 19fdbfb5c4
commit a3891ea46c
2 changed files with 286 additions and 250 deletions

516
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -582,6 +582,12 @@ AC_MSG_RESULT($enable_toolbox_glue)
AC_SUBST(LIBTOOL_CRUFT) AC_SUBST(LIBTOOL_CRUFT)
case $ac_sys_system/$ac_sys_release in case $ac_sys_system/$ac_sys_release in
Darwin/1.4*)
ns_undef_sym='_environ'
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
Darwin/*) Darwin/*)
ns_undef_sym='_environ' ns_undef_sym='_environ'
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym" LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
@ -599,7 +605,10 @@ then
# -F. is needed to allow linking to the framework while # -F. is needed to allow linking to the framework while
# in the build location. # in the build location.
LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym" case $ac_sys_system/$ac_sys_release in
Darwin/1.4*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
esac
AC_DEFINE(WITH_NEXT_FRAMEWORK) AC_DEFINE(WITH_NEXT_FRAMEWORK)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
@ -662,6 +671,15 @@ then
hp*|HP*) LDSHARED="ld -b";; hp*|HP*) LDSHARED="ld -b";;
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
DYNIX/ptx*) LDSHARED="ld -G";; DYNIX/ptx*) LDSHARED="ld -G";;
Darwin/1.4*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
# Link against the framework. All externals should be defined.
LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
else
# No framework. Ignore undefined symbols, assuming they come from Python
LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Darwin/*) Darwin/*)
LDSHARED='$(CC) $(LDFLAGS) -bundle' LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then if test "$enable_framework" ; then