From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 24 Feb 2009 11:07:44 +0000 (+0000)
Subject: - Link the shared python library with $(MODLIBS).
X-Git-Tag: v2.6.2c1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54fba82310bd8441dfc580e37daacb52a217d4fb;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 37dd77fe87f6..5c5e29c37b6d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -412,10 +412,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)
@@ -423,7 +423,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 97688f26e502..c71c6786cd31 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -201,6 +201,11 @@ Extension Modules
 
 - Issue #1040026: Fix os.times result on systems where HZ is incorrect.
 
+Build
+-----
+
+- Link the shared python library with $(MODLIBS).
+
 
 What's New in Python 2.6.1
 ==========================