mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 19:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

After discussion on the PythonMac-SIG it was decided that it is better

Browse source 
to make using "-undefined dynamic_lookup" for linking extensions more
automatic on 10.3 and later. So if we're on that platform and
MACOSX_DEPLOYMENT_TARGET is not set we now set it to the current OSX
version during configure. Additionally, distutils will pick up the
configure-time value by default.

Will backport.
This commit is contained in:
Jack Jansen 2004-12-26 23:07:48 +00:00
parent 6116f07fdc
commit be95462c1c
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/sysconfig.py
View file

@ -360,11 +360,13 @@ def _init_posix():
# On MacOSX we need to check the setting of the environment variable # On MacOSX we need to check the setting of the environment variable
# MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
# it needs to be compatible. # it needs to be compatible.
# An alternative would be to force MACOSX_DEPLOYMENT_TARGET to be # If it isn't set we set it to the configure-time value
# the same as during configure.
if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'): if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET'] cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '') cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
if cur_target == '':
cur_target = cfg_target
os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
if cfg_target != cur_target: if cfg_target != cur_target:
my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure' my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
% (cur_target, cfg_target)) % (cur_target, cfg_target))

7
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.475 . # From configure.in Revision: 1.477 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.5. # Generated by GNU Autoconf 2.59 for python 2.5.
# #
@ -10322,11 +10322,12 @@ then
Darwin/*) Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later). # Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python # This allows an extension to be used in any Python
if test ${MACOSX_DEPLOYMENT_TARGET-10.1} '>' 10.2 cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
then then
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED" BLDSHARED="$LDSHARED"
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
else else
LDSHARED='$(CC) $(LDFLAGS) -bundle' LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then if test "$enable_framework" ; then

5
configure.in
View file

@ -1324,11 +1324,12 @@ then
Darwin/*) Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and later). # Use -undefined dynamic_lookup whenever possible (10.3 and later).
# This allows an extension to be used in any Python # This allows an extension to be used in any Python
if test ${MACOSX_DEPLOYMENT_TARGET-10.1} '>' 10.2 cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
then then
LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
BLDSHARED="$LDSHARED" BLDSHARED="$LDSHARED"
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
else else
LDSHARED='$(CC) $(LDFLAGS) -bundle' LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then if test "$enable_framework" ; then