Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #14197: For OS X framework builds, ensure links to the shared 

library are created with the proper ABI suffix.
This commit is contained in:
Ned Deily 2012-07-24 03:31:48 -07:00
parent 55624da8a8
commit ecd4e9de5a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.pre.in
View File

@ -1158,8 +1158,11 @@ frameworkinstallstructure: $(LDLIBRARY)
# Install a number of symlinks to keep software that expects a normal unix # Install a number of symlinks to keep software that expects a normal unix
# install (which includes python-config) happy. # install (which includes python-config) happy.
frameworkinstallmaclib: 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).a"
ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).dylib" 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" ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib"
# This installs the IDE, the Launcher and other apps into /Applications # This installs the IDE, the Launcher and other apps into /Applications

3
Misc/NEWS
View File

@ -402,6 +402,9 @@ Tests
Build 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. - Issue #14472: Update .gitignore. Patch by Matej Cepl.
- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6. - The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6.

1
Misc/python-config.in
View File

@ -52,6 +52,7 @@ for opt in opt_flags:
if opt == '--ldflags': if opt == '--ldflags':
if not getvar('Py_ENABLE_SHARED'): if not getvar('Py_ENABLE_SHARED'):
libs.insert(0, '-L' + getvar('LIBPL')) libs.insert(0, '-L' + getvar('LIBPL'))
if not getvar('PYTHONFRAMEWORK'):
libs.extend(getvar('LINKFORSHARED').split()) libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs)) print(' '.join(libs))