From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 22 Feb 2009 23:14:26 +0000 (+0000)
Subject: - Link the shared python library with $(MODLIBS).
X-Git-Tag: v2.7a1~1963
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad554fdbea689581f97774acc77e5c15bcac15a;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 16c3df4111f4..1c2d1f042001 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -411,10 +411,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)
@@ -422,7 +422,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 eb71173f18d1..778720302cd3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -494,6 +494,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.