[Python-checkins] python/dist/src/Lib/distutils sysconfig.py, 1.58, 1.59

Thu Jun 3 08:41:48 EDT 2004

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20139/Lib/distutils
Modified Files:
	sysconfig.py 
Log Message:
Partial fix for #887242 (link extensions with dynamic_lookup in stead
of hard linking against the framework).
If $MACOSX_DEPLOYMENT_TARGET is set, and >= 10.3, during configure we
setup extensions to link with dynamic lookup. We also record the
value in the Makefile.
Distutils checks whether a value for MACOSX_DEPLOYMENT_TARGET was
recorded in the Makefile, and if it was insists that the current
value matches.
This is only a partial fix because it only applies to 2.4, and the
"two python problem" exists with Python 2.3 shipped with MacOSX 10.3,
which we have no influence over.
Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** sysconfig.py	24 Oct 2003 20:09:23 -0000	1.58
--- sysconfig.py	3 Jun 2004 12:41:45 -0000	1.59
***************
*** 356,360 ****
 raise DistutilsPlatformError(my_msg)

! 
 # On AIX, there are wrong paths to the linker scripts in the Makefile
 # -- these paths are relative to the Python source, but when installed
--- 356,372 ----
 raise DistutilsPlatformError(my_msg)

! # On MacOSX we need to check the setting of the environment variable
! # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
! # it needs to be compatible.
! # An alternative would be to force MACOSX_DEPLOYMENT_TARGET to be
! # the same as during configure.
! if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
! cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
! cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
! if cfg_target != cur_target:
! my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
! % (cur_target, cfg_target))
! raise DistutilsPlatformError(my_msg)
! 
 # On AIX, there are wrong paths to the linker scripts in the Makefile
 # -- these paths are relative to the Python source, but when installed