diff options
| author | Michael W. Hudson <mwh@python.net> | 2002-03-07 09:58:56 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2002-03-07 09:58:56 (GMT) |
| commit | 0c46c0cc70613c34862513a2c8d679128146e90e (patch) | |
| tree | dd1e60fe824a9904252f4489aaa5c69fc1597a77 | |
| parent | 02b28ec316114a646c7875a76edeb577c5c3581b (diff) | |
| download | cpython-0c46c0cc70613c34862513a2c8d679128146e90e.zip cpython-0c46c0cc70613c34862513a2c8d679128146e90e.tar.gz cpython-0c46c0cc70613c34862513a2c8d679128146e90e.tar.bz2 | |
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.
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | setup.py | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/configure.in b/configure.in index d64174f..46560e9 100644 --- a/configure.in +++ b/configure.in @@ -793,8 +793,9 @@ 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" + # 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";; dgux*) LDSHARED="ld -G";; @@ -604,7 +604,8 @@ class PyBuildExt(build_ext): # available here. This Makefile variable is also what the install # procedure triggers on. frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR') - exts.append( Extension('gestalt', ['gestaltmodule.c']) ) + exts.append( Extension('gestalt', ['gestaltmodule.c'], + extra_link_args=['-framework', 'Carbon']) ) exts.append( Extension('MacOS', ['macosmodule.c'], extra_link_args=['-framework', 'Carbon']) ) exts.append( Extension('icglue', ['icgluemodule.c'], @@ -613,8 +614,10 @@ class PyBuildExt(build_ext): ['macfsmodule.c', '../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('_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']) ) if frameworkdir: |