<!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>[125362] trunk/base</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/125362">125362</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-09-14 12:27:18 -0700 (Sun, 14 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: Avoid using $GZIP and $BZIP2, since those might be interpreted as flags and cause the build to fail, e.g. #43245</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseMkmacportsautoconfmkin">trunk/base/Mk/macports.autoconf.mk.in</a></li>
<li><a href="#trunkbaseaclocalm4">trunk/base/aclocal.m4</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
<li><a href="#trunkbasesrcmacports10macports_autoconftclin">trunk/base/src/macports1.0/macports_autoconf.tcl.in</a></li>
<li><a href="#trunkbasesrcport10port_autoconftclin">trunk/base/src/port1.0/port_autoconf.tcl.in</a></li>
<li><a href="#trunkbasesrcregistry20registry_autoconftclin">trunk/base/src/registry2.0/registry_autoconf.tcl.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseMkmacportsautoconfmkin"></a>
<div class="modfile"><h4>Modified: trunk/base/Mk/macports.autoconf.mk.in (125361 => 125362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/Mk/macports.autoconf.mk.in 2014-09-14 18:48:52 UTC (rev 125361)
+++ trunk/base/Mk/macports.autoconf.mk.in 2014-09-14 19:27:18 UTC (rev 125362)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> MTREE = @MTREE@
</span><span class="cx"> LN_S = @LN_S@
</span><span class="cx"> XCODEBUILD = @XCODEBUILD@
</span><del>-BZIP2 = @BZIP2@
</del><span class="cx">
</span><span class="cx"> INTREE_TCLSH = @INTREE_TCLSH@
</span><span class="cx"> TCLSH = @TCLSH@
</span></span></pre></div>
<a id="trunkbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: trunk/base/aclocal.m4 (125361 => 125362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/aclocal.m4 2014-09-14 18:48:52 UTC (rev 125361)
+++ trunk/base/aclocal.m4 2014-09-14 19:27:18 UTC (rev 125362)
</span><span class="lines">@@ -118,8 +118,10 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl MP_CONFIG_TARBALL([path-to-tarball], [dir-extracted-from-tarball-with-configure], [configure-parameters])
</span><span class="cx"> AC_DEFUN([MP_CONFIG_TARBALL], [
</span><del>- AC_PATH_PROG(GZIP, [gzip], [])
- AC_PATH_PROG(BZIP2, [bzip2], [])
</del><ins>+ dnl Warning: Don't use $GZIP and $BZIP2 here, both tools interpret these
+ dnl env variables as additional parameters.
+ AC_PATH_PROG(GZIP_BIN, [gzip], [])
+ AC_PATH_PROG(BZIP2_BIN, [bzip2], [])
</ins><span class="cx">
</span><span class="cx"> mp_tarball="$1"
</span><span class="cx"> ac_dir=$2
</span><span class="lines">@@ -132,16 +134,16 @@
</span><span class="cx"> mp_tarball_extract_cmd=
</span><span class="cx"> case "$mp_tarball" in
</span><span class="cx"> *.tar.gz | *.tgz)
</span><del>- if test "x$GZIP" = "x"; then
</del><ins>+ if test "x$GZIP_BIN" = "x"; then
</ins><span class="cx"> AC_MSG_ERROR([gzip not found])
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$GZIP"
</del><ins>+ mp_tarball_extract_cmd="$GZIP_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *.tar.bz2 | *.tbz2)
</span><del>- if test "x$BZIP2" = "x"; then
</del><ins>+ if test "x$BZIP2_BIN" = "x"; then
</ins><span class="cx"> AC_MSG_ERROR([bzip2 not found])
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$BZIP2"
</del><ins>+ mp_tarball_extract_cmd="$BZIP2_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> AC_MSG_ERROR([Don't know how to extract tarball $mp_tarball])
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (125361 => 125362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-09-14 18:48:52 UTC (rev 125361)
+++ trunk/base/configure.ac 2014-09-14 19:27:18 UTC (rev 125362)
</span><span class="lines">@@ -102,8 +102,14 @@
</span><span class="cx"> AC_PROG_OBJC([clang cc gcc])
</span><span class="cx">
</span><span class="cx"> # Check for user-supplied paths before searching
</span><ins>+
+dnl Beware of conflicts between the variables you set and any tools executed in
+dnl the configure context. Some tools interpret an environment variable with
+dnl their own name as default flags and will fail if it is set to a path. For
+dnl example, these include BZIP2 and GZIP, which is the reason why they are
+dnl named with a _BIN suffix here.
</ins><span class="cx"> MP_TOOL_PATH(BSDMAKE, [bsdmake/pmake])
</span><del>-MP_TOOL_PATH(BZIP2, [bzip2])
</del><ins>+MP_TOOL_PATH(BZIP2_BIN, [bzip2])
</ins><span class="cx"> MP_TOOL_PATH(CVS, [cvs])
</span><span class="cx"> MP_TOOL_PATH(GNUMAKE, [gnumake])
</span><span class="cx"> MP_TOOL_PATH(GNUTAR, [gnutar])
</span><span class="lines">@@ -122,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> # Search for tool paths. Any set above (via --with-pkg=PATH) will be retained
</span><span class="cx"> AC_PATH_PROGS(BSDMAKE, [bsdmake pmake], [])
</span><del>-AC_PATH_PROG(BZIP2, [bzip2], [])
</del><ins>+AC_PATH_PROG(BZIP2_BIN, [bzip2], [])
</ins><span class="cx"> AC_PATH_PROG(BZR, [bzr], [])
</span><span class="cx"> AC_PATH_PROG(CHOWN, [chown], [], [$PATH:/usr/sbin])
</span><span class="cx"> AC_PATH_PROG(CP, [cp], [])
</span><span class="lines">@@ -137,7 +143,7 @@
</span><span class="cx"> AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [])
</span><span class="cx"> AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [])
</span><span class="cx"> AC_PATH_PROGS(GNUTAR, [gnutar gtar], [])
</span><del>-AC_PATH_PROG(GZIP, [gzip], [])
</del><ins>+AC_PATH_PROG(GZIP_BIN, [gzip], [])
</ins><span class="cx"> AC_PATH_PROG(HDIUTIL, [hdiutil], [])
</span><span class="cx"> AC_PATH_PROG(HG, [hg], [])
</span><span class="cx"> AC_PATH_PROG(LAUNCHCTL, [launchctl], [])
</span></span></pre></div>
<a id="trunkbasesrcmacports10macports_autoconftclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports_autoconf.tcl.in (125361 => 125362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports_autoconf.tcl.in 2014-09-14 18:48:52 UTC (rev 125361)
+++ trunk/base/src/macports1.0/macports_autoconf.tcl.in 2014-09-14 19:27:18 UTC (rev 125362)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> package provide macports 1.0
</span><span class="cx">
</span><span class="cx"> namespace eval macports::autoconf {
</span><del>- variable bzip2_path "@BZIP2@"
</del><ins>+ variable bzip2_path "@BZIP2_BIN@"
</ins><span class="cx"> variable chown_path "@CHOWN@"
</span><del>- variable gzip_path "@GZIP@"
</del><ins>+ variable gzip_path "@GZIP_BIN@"
</ins><span class="cx"> variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
</span><span class="cx"> variable macports_version "@MACPORTS_VERSION@"
</span><span class="cx"> variable macports_user_dir "~/.macports"
</span></span></pre></div>
<a id="trunkbasesrcport10port_autoconftclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/port_autoconf.tcl.in (125361 => 125362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/port_autoconf.tcl.in 2014-09-14 18:48:52 UTC (rev 125361)
+++ trunk/base/src/port1.0/port_autoconf.tcl.in 2014-09-14 19:27:18 UTC (rev 125362)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> package provide port 1.0
</span><span class="cx">
</span><span class="cx"> namespace eval portutil::autoconf {
</span><del>- variable bzip2_path "@BZIP2@"
</del><ins>+ variable bzip2_path "@BZIP2_BIN@"
</ins><span class="cx"> variable lzma_path "@LZMA@"
</span><span class="cx"> variable xz_path "@XZ@"
</span><span class="cx"> variable cp_path "@CP@"
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> variable svn_path "@SVN@"
</span><span class="cx"> variable git_path "@GIT@"
</span><span class="cx"> variable hg_path "@HG@"
</span><del>- variable gzip_path "@GZIP@"
</del><ins>+ variable gzip_path "@GZIP_BIN@"
</ins><span class="cx"> variable lipo_path "@LIPO@"
</span><span class="cx"> variable openssl_path "@OPENSSL@"
</span><span class="cx"> variable patch_path "@PATCH@"
</span></span></pre></div>
<a id="trunkbasesrcregistry20registry_autoconftclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/registry_autoconf.tcl.in (125361 => 125362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/registry_autoconf.tcl.in 2014-09-14 18:48:52 UTC (rev 125361)
+++ trunk/base/src/registry2.0/registry_autoconf.tcl.in 2014-09-14 19:27:18 UTC (rev 125362)
</span><span class="lines">@@ -31,5 +31,5 @@
</span><span class="cx"> package provide registry 1.0
</span><span class="cx">
</span><span class="cx"> namespace eval registry::autoconf {
</span><del>- variable bzip2_path "@BZIP2@"
</del><ins>+ variable bzip2_path "@BZIP2_BIN@"
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>