[Python-checkins] cpython (merge 3.2 -> default): Issue #14197: merge
ned.deily
python-checkins at python.org
Tue Jul 24 12:46:16 CEST 2012
http://hg.python.org/cpython/rev/51ac5f06dd04
changeset: 78265:51ac5f06dd04
parent: 78263:00db71b3c5bd
parent: 78264:2d4f290ea71c
user: Ned Deily <nad at acm.org>
date: Tue Jul 24 03:45:39 2012 -0700
summary:
Issue #14197: merge
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
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --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
More information about the Python-checkins
mailing list