diff options
| author | Ned Deily <nad@acm.org> | 2012-07-24 10:31:48 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-07-24 10:31:48 (GMT) |
| commit | ecd4e9de5afab6a5d75a6fa7ebfb62804ba69264 (patch) | |
| tree | ac83e16c4246fc0467cbd0c3671b2b76f3f41814 | |
| parent | 55624da8a81887e8d03f6cd496cbf92f3a6011a5 (diff) | |
| download | cpython-ecd4e9de5afab6a5d75a6fa7ebfb62804ba69264.zip cpython-ecd4e9de5afab6a5d75a6fa7ebfb62804ba69264.tar.gz cpython-ecd4e9de5afab6a5d75a6fa7ebfb62804ba69264.tar.bz2 | |
Issue #14197: For OS X framework builds, ensure links to the shared
library are created with the proper ABI suffix.
| -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 9cc15c9..e5c2a3f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1158,8 +1158,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 @@ -402,6 +402,9 @@ Tests Build ----- +- Issue #14197: For OS X framework builds, ensure links to the shared + library are created with the proper ABI suffix. + - Issue #14472: Update .gitignore. Patch by Matej Cepl. - The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. 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': |