From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 22 Feb 2009 23:18:38 +0000 (+0000)
Subject: Merged revisions 69889 via svnmerge from
X-Git-Tag: v3.1a1~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=906785c4c20c5b2ea25fbca63c01732a6818e61c;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 69889 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69889 | matthias.klose | 2009-02-23 00:14:26 +0100 (Mo, 23 Feb 2009) | 2 lines

  - Link the shared python library with $(MODLIBS).
........
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 0c33171417e9..8f3384b3303a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -419,10 +419,10 @@ $(LIBRARY): $(LIBRARY_OBJS)
 
 libpython$(VERSION).so: $(LIBRARY_OBJS)
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
-		$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+		$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
 		$(LN) -f $(INSTSONAME) $@; \
 	else \
-		$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+		$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
 	fi
 
 libpython$(VERSION).dylib: $(LIBRARY_OBJS)
@@ -430,7 +430,7 @@ libpython$(VERSION).dylib: $(LIBRARY_OBJS)
 		 
 
 libpython$(VERSION).sl: $(LIBRARY_OBJS)
-	$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
+	$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
 
 # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
 # minimal framework (not including the Lib directory and such) in the current
diff --git a/Misc/NEWS b/Misc/NEWS
index ea659a57b1b9..09af442be771 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -479,6 +479,8 @@ Tools/Demos
 Build
 -----
 
+- Link the shared python library with $(MODLIBS).
+
 - Issue #5134: Silence compiler warnings when compiling sqlite with VC++.
 
 - Issue #4494: Fix build with Py_NO_ENABLE_SHARED on Windows.