[127198] trunk/dports/devel/libtool

larryv at macports.org larryv at macports.org
Wed Oct 22 13:07:27 PDT 2014


Revision: 127198
          https://trac.macports.org/changeset/127198
Author:   larryv at macports.org
Date:     2014-10-22 13:07:27 -0700 (Wed, 22 Oct 2014)
Log Message:
-----------
libtool: Avoid unnecessary regeneration during build

Our patches cause the build process to regenerate several files that
don't really have to be regenerated. So the build dependencies on
autoconf and automake are not really necessary.

The build also runs the configure script a second time, during the build
phase. This second configure run detects MacPorts' grep and gsed if they
are available and subsequently pollutes glibtoolize (#45509).

Reworking the stdlib patch and updating modification dates on select
files solves these problems and lets us drop the build dependenies on
autoconf and automake.

Modified Paths:
--------------
    trunk/dports/devel/libtool/Portfile

Added Paths:
-----------
    trunk/dports/devel/libtool/files/allow-stdlib-flag.patch

Removed Paths:
-------------
    trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff

Modified: trunk/dports/devel/libtool/Portfile
===================================================================
--- trunk/dports/devel/libtool/Portfile	2014-10-22 19:58:32 UTC (rev 127197)
+++ trunk/dports/devel/libtool/Portfile	2014-10-22 20:07:27 UTC (rev 127198)
@@ -5,7 +5,7 @@
 
 name                libtool
 version             2.4.2
-revision            4
+revision            5
 categories          devel sysutils
 platforms           darwin freebsd
 # Scripts are GPL-2+, libltdl is LGPL-2+, but all parts that tend to be
@@ -20,7 +20,6 @@
                     libraries behind a consistent, portable interface.
 homepage            http://www.gnu.org/software/libtool/
 
-depends_build       port:automake port:autoconf
 if {${os.platform} ne "darwin"} {
     depends_lib     port:grep port:gsed
 }
@@ -29,13 +28,26 @@
 checksums           rmd160  b7153f3f1e1c50d8c04787cafccd4e19af62ec7d \
                     sha256  b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
 
-# Patch to allow -stdlib=* for the linker
-# See ticket 32982.
-# committed upstream -> remove for libtool 2.4.3
-patchfiles      ltmain.m4sh-allow-clang-stdlib.diff
+# http://trac.macports.org/ticket/32982
+patchfiles          allow-stdlib-flag.patch
+post-patch {
+    # Prevent build from trying to regenerate. This file says nothing
+    # about -stdlib.
+    touch ${worksrcpath}/doc/libtool.1
+}
 
 # Fix detection of MACOSX_DEPLOYMENT_TARGET on Yosemite and later.
 patchfiles-append   yosemite-symbol-lookup.patch
+post-patch {
+    # Prevent build from trying to regenerate. These files don't have
+    # anything to do with MACOSX_DEPLOYMENT_TARGET or -undefined.
+    touch ${worksrcpath}/aclocal.m4 \
+            ${worksrcpath}/Makefile.in \
+            ${worksrcpath}/config-h.in \
+            ${worksrcpath}/libltdl/aclocal.m4 \
+            ${worksrcpath}/libltdl/Makefile.in \
+            ${worksrcpath}/libltdl/config-h.in
+}
 
 platform darwin {
     configure.env   GREP=/usr/bin/grep \

Copied: trunk/dports/devel/libtool/files/allow-stdlib-flag.patch (from rev 127196, trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff)
===================================================================
--- trunk/dports/devel/libtool/files/allow-stdlib-flag.patch	                        (rev 0)
+++ trunk/dports/devel/libtool/files/allow-stdlib-flag.patch	2014-10-22 20:07:27 UTC (rev 127198)
@@ -0,0 +1,16 @@
+Index: libltdl/config/ltmain.sh
+===================================================================
+--- libltdl/config/ltmain.sh.orig
++++ libltdl/config/ltmain.sh
+@@ -5851,9 +5851,10 @@ func_mode_link ()
+       # -tp=*                Portland pgcc target processor selection
+       # --sysroot=*          for sysroot support
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -stdlib=*            select c++ std lib with clang
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"

Deleted: trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff
===================================================================
--- trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff	2014-10-22 19:58:32 UTC (rev 127197)
+++ trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff	2014-10-22 20:07:27 UTC (rev 127198)
@@ -1,14 +0,0 @@
---- libltdl/config/ltmain.m4sh.org	2012-01-22 10:42:35.000000000 +0100
-+++ libltdl/config/ltmain.m4sh	2012-01-22 10:43:32.000000000 +0100
-@@ -5064,9 +5064,10 @@
-       # -tp=*                Portland pgcc target processor selection
-       # --sysroot=*          for sysroot support
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+      # -stdlib=*            select c++ std lib with clang
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141022/c5a54aea/attachment-0001.html>


More information about the macports-changes mailing list