[Python-checkins] CVS: python/dist/src setup.py,1.83,1.84 configure.in,1.292,1.293
Michael Hudson
mwh@users.sourceforge.net
2002年3月07日 01:58:59 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv16226
Modified Files:
setup.py configure.in
Log Message:
Apply Jack's patch attached to
[ 508779 ] Disable flat namespace on MacOS X
I presume you wanted this on the trunk too, Jack?
2.2.1 candidate.
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** setup.py 1 Mar 2002 14:16:31 -0000 1.83
--- setup.py 7 Mar 2002 09:58:56 -0000 1.84
***************
*** 605,609 ****
# procedure triggers on.
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
! exts.append( Extension('gestalt', ['gestaltmodule.c']) )
exts.append( Extension('MacOS', ['macosmodule.c'],
extra_link_args=['-framework', 'Carbon']) )
--- 605,610 ----
# procedure triggers on.
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
! exts.append( Extension('gestalt', ['gestaltmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('MacOS', ['macosmodule.c'],
extra_link_args=['-framework', 'Carbon']) )
***************
*** 614,619 ****
'../Python/getapplbycreator.c'],
extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
! exts.append( Extension('_Res', ['res/_Resmodule.c']) )
exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
extra_link_args=['-framework', 'Carbon']) )
--- 615,622 ----
'../Python/getapplbycreator.c'],
extra_link_args=['-framework', 'Carbon']) )
! exts.append( Extension('_CF', ['cf/_CFmodule.c'],
! extra_link_args=['-framework', 'CoreFoundation']) )
! exts.append( Extension('_Res', ['res/_Resmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
extra_link_args=['-framework', 'Carbon']) )
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.292
retrieving revision 1.293
diff -C2 -d -r1.292 -r1.293
*** configure.in 24 Feb 2002 16:05:05 -0000 1.292
--- configure.in 7 Mar 2002 09:58:56 -0000 1.293
***************
*** 794,799 ****
LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
else
! # No framework. Ignore undefined symbols, assuming they come from Python
! LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Linux*|GNU*) LDSHARED="gcc -shared";;
--- 794,800 ----
LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
else
! # No framework, use the Python app as bundle-loader
! BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
! LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)'
fi ;;
Linux*|GNU*) LDSHARED="gcc -shared";;