From: Ned Deily <nad@acm.org>
Date: Tue, 24 Jul 2012 10:31:48 +0000 (-0700)
Subject: Issue #14197: For OS X framework builds, ensure links to the shared
X-Git-Tag: v3.3.0b2~116^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecd4e9de5afab6a5d75a6fa7ebfb62804ba69264;p=thirdparty%2FPython%2Fcpython.git

Issue #14197: For OS X framework builds, ensure links to the shared
library are created with the proper ABI suffix.
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 9cc15c963e10..e5c2a3f301fe 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
diff --git a/Misc/NEWS b/Misc/NEWS
index 539c905b45db..0bc65821175f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 1d4a81d8502d..79f0bb14c1d9 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':