Patch 1673122: be explicit about which libtool to use, to avoid name clashes

when a users install GNU libtool early in his PATH

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2ee077d0df720ffebb463b941a2d1d5e15d464eb..0e4baad101ec3e3d361300e6bcffbfe24f7fa5a2 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -391,7 +391,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
                        -compatibility_version $(VERSION) \
                        -current_version $(VERSION); \
         else \
-               libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
+               /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
                        @LIBTOOL_CRUFT@ ;\
        fi
        $(INSTALL) -d -m $(DIRMODE)  \

diff --git a/Misc/NEWS b/Misc/NEWS
index 449b4e8fa0b597c5ecfd72f5b363b596e6d64ed5..d9d2133eff49b0e242e72b73e1ce598eb9c9912b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,9 @@ Library
 - Fix test_pty.py to not hang on OS X (and theoretically other *nixes) when
   run in verbose mode.
 
+- Bug #1693258: IDLE would show two "Preferences" menu's with some versions
+  of Tcl/Tk
+
 
 Extension Modules
 -----------------
@@ -74,6 +77,12 @@ Documentation
 - Bug #1569057: Document that calling file.next() on a file open for writing
   has undefined behaviour.  Backport of r54712.
 
+Build
+-----
+
+- Patch #1673122: Use an explicit path to libtool when building a framework. 
+  This avoids picking up GNU libtool from a users PATH.
+
 
 What's New in Python 2.5.1?
 =============================