diff options
| author | Ned Deily <nad@acm.org> | 2012-07-24 10:45:39 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-07-24 10:45:39 (GMT) |
| commit | c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef (patch) | |
| tree | 0549faa537ff03780a7fc870ef3c7fda2458fde4 | |
| parent | e9f35cc149ed519435845e299aab0a07b5848307 (diff) | |
| parent | ecd4e9de5afab6a5d75a6fa7ebfb62804ba69264 (diff) | |
| download | cpython-c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef.zip cpython-c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef.tar.gz cpython-c59cc8f5ea4f5a7a1bf592fbca662e0f305bceef.tar.bz2 | |
Issue #14197: merge
| -rw-r--r-- | Makefile.pre.in | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Misc/python-config.in | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index a421d6c..adffa03 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1238,8 +1238,11 @@ frameworkinstallstructure: $(LDLIBRARY) # Install a number of symlinks to keep software that expects a normal unix # install (which includes python-config) happy. frameworkinstallmaclib: + ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).a" + ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).dylib" ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).a" ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).dylib" + ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(LDVERSION).dylib" ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib" # This installs the IDE, the Launcher and other apps into /Applications @@ -229,6 +229,9 @@ Tests Build ----- +- Issue #14197: For OS X framework builds, ensure links to the shared + library are created with the proper ABI suffix. + - Issue #14330: For cross builds, don't use host python, use host search paths for host compiler. diff --git a/Misc/python-config.in b/Misc/python-config.in index 1d4a81d..79f0bb1 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -52,7 +52,8 @@ for opt in opt_flags: if opt == '--ldflags': if not getvar('Py_ENABLE_SHARED'): libs.insert(0, '-L' + getvar('LIBPL')) - libs.extend(getvar('LINKFORSHARED').split()) + if not getvar('PYTHONFRAMEWORK'): + libs.extend(getvar('LINKFORSHARED').split()) print(' '.join(libs)) elif opt == '--extension-suffix': |