[Python-checkins] cpython (3.2): Issue #14197: For OS X framework builds, ensure links to the shared

[ned.deily]

http://hg.python.org/cpython/rev/2d4f290ea71c
changeset:   78264:2d4f290ea71c
branch:      3.2
parent:      78262:52032b13243e
user:        Ned Deily <nad at acm.org>
date:        Tue Jul 24 03:31:48 2012 -0700
summary:
  Issue #14197: For OS X framework builds, ensure links to the shared
library are created with the proper ABI suffix.

files:
  Makefile.pre.in       |  3 +++
  Misc/NEWS             |  3 +++
  Misc/python-config.in |  3 ++-
  3 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1158,8 +1158,11 @@
 # 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -402,6 +402,9 @@
 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
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -52,7 +52,8 @@
         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':

-- 
Repository URL: http://hg.python.org/cpython