svn commit: r1689366 - /subversion/trunk/tools/dist/release.py

[ph...@apache.org]

Author: philip
Date: Mon Jul  6 11:12:03 2015
New Revision: 1689366

URL: http://svn.apache.org/r1689366
Log:
* tools/dist/release.py
  (tool_versions): Update to libtool 2.4.6 for trunk/1.9.
  (LibtoolDep.build): New, create glibtool symlinks.

Modified:
    subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1689366&r1=1689365&r2=1689366&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Jul  6 11:12:03 2015
@@ -86,12 +86,12 @@ except AttributeError:
 tool_versions = {
   'trunk' : {
             'autoconf' : '2.69',
-            'libtool'  : '2.4.3',
+            'libtool'  : '2.4.6',
             'swig'     : '2.0.12',
   },
   '1.9' : {
             'autoconf' : '2.69',
-            'libtool'  : '2.4.3',
+            'libtool'  : '2.4.6',
             'swig'     : '2.0.12'
   },
   '1.8' : {
@@ -356,6 +356,13 @@ class LibtoolDep(RollDep):
         # system libtool (I'm looking at you, Debian).
         return False
 
+    def build(self):
+        RollDep.build(self)
+        # autogen.sh looks for glibtoolize before libtoolize
+        bin_dir = os.path.join(get_prefix(self._base_dir), "bin")
+        os.symlink("libtoolize", os.path.join(bin_dir, "glibtoolize"))
+        os.symlink("libtool", os.path.join(bin_dir, "glibtool"))
+
 
 class SwigDep(RollDep):
     def __init__(self, base_dir, use_existing, verbose, swig_ver, sf_mirror):