<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127198] trunk/dports/devel/libtool</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127198">127198</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-10-22 13:07:27 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibtoolPortfile">trunk/dports/devel/libtool/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibtoolfilesallowstdlibflagpatch">trunk/dports/devel/libtool/files/allow-stdlib-flag.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibtoolfilesltmainm4shallowclangstdlibdiff">trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibtoolPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libtool/Portfile (127197 => 127198)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name libtool
</span><span class="cx"> version 2.4.2
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> categories devel sysutils
</span><span class="cx"> platforms darwin freebsd
</span><span class="cx"> # Scripts are GPL-2+, libltdl is LGPL-2+, but all parts that tend to be
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> libraries behind a consistent, portable interface.
</span><span class="cx"> homepage http://www.gnu.org/software/libtool/
</span><span class="cx">
</span><del>-depends_build port:automake port:autoconf
</del><span class="cx"> if {${os.platform} ne "darwin"} {
</span><span class="cx"> depends_lib port:grep port:gsed
</span><span class="cx"> }
</span><span class="lines">@@ -29,13 +28,26 @@
</span><span class="cx"> checksums rmd160 b7153f3f1e1c50d8c04787cafccd4e19af62ec7d \
</span><span class="cx"> sha256 b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
</span><span class="cx">
</span><del>-# 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
</del><ins>+# 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
+}
</ins><span class="cx">
</span><span class="cx"> # Fix detection of MACOSX_DEPLOYMENT_TARGET on Yosemite and later.
</span><span class="cx"> patchfiles-append yosemite-symbol-lookup.patch
</span><ins>+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
+}
</ins><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> configure.env GREP=/usr/bin/grep \
</span></span></pre></div>
<a id="trunkdportsdevellibtoolfilesallowstdlibflagpatchfromrev127196trunkdportsdevellibtoolfilesltmainm4shallowclangstdlibdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/libtool/files/allow-stdlib-flag.patch (from rev 127196, trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff) (0 => 127198)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+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"
</ins></span></pre></div>
<a id="trunkdportsdevellibtoolfilesltmainm4shallowclangstdlibdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libtool/files/ltmain.m4sh-allow-clang-stdlib.diff (127197 => 127198)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- 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"
</del></span></pre>
</div>
</div>
</body>
</html>