Commit f23f0dbe authored by Ned Deily's avatar Ned Deily

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

library are created with the proper ABI suffix.
parent 9c275927
...@@ -1158,8 +1158,11 @@ frameworkinstallstructure: $(LDLIBRARY) ...@@ -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
......
...@@ -402,6 +402,9 @@ Tests ...@@ -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.
......
...@@ -52,7 +52,8 @@ for opt in opt_flags: ...@@ -52,7 +52,8 @@ 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'))
libs.extend(getvar('LINKFORSHARED').split()) if not getvar('PYTHONFRAMEWORK'):
libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs)) print(' '.join(libs))
elif opt == '--extension-suffix': elif opt == '--extension-suffix':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment