changeset:   78265:51ac5f06dd04
parent:      78263:00db71b3c5bd
parent:      78264:2d4f290ea71c
user:        Ned Deily <nad@acm.org>
date:        Tue Jul 24 03:45:39 2012 -0700
files:       Makefile.pre.in Misc/NEWS
description:
Issue #14197: merge


diff -r 00db71b3c5bd -r 51ac5f06dd04 Makefile.pre.in
--- a/Makefile.pre.in	Mon Jul 23 18:43:18 2012 +0200
+++ b/Makefile.pre.in	Tue Jul 24 03:45:39 2012 -0700
@@ -1238,8 +1238,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 -r 00db71b3c5bd -r 51ac5f06dd04 Misc/NEWS
--- a/Misc/NEWS	Mon Jul 23 18:43:18 2012 +0200
+++ b/Misc/NEWS	Tue Jul 24 03:45:39 2012 -0700
@@ -229,6 +229,9 @@
 Build
 -----
 
+- Issue #14197: For OS X framework builds, ensure links to the shared
+  library are created with the proper ABI suffix.
+
 - Issue #14330: For cross builds, don't use host python, use host search paths
   for host compiler.
 
diff -r 00db71b3c5bd -r 51ac5f06dd04 Misc/python-config.in
--- a/Misc/python-config.in	Mon Jul 23 18:43:18 2012 +0200
+++ b/Misc/python-config.in	Tue Jul 24 03:45:39 2012 -0700
@@ -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':