<!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>[117727] 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/117727">117727</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-09 14:13:07 -0700 (Sun, 09 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>configure: remove -L$prefix/* and -I$prefix/* from env variables affecting the compiler, provide an option to avoid this, see #42756</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseaclocalm4">trunk/base/aclocal.m4</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: trunk/base/aclocal.m4 (117726 => 117727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/aclocal.m4 2014-03-09 20:45:45 UTC (rev 117726)
+++ trunk/base/aclocal.m4 2014-03-09 21:13:07 UTC (rev 117727)
</span><span class="lines">@@ -972,6 +972,60 @@
</span><span class="cx">
</span><span class="cx"> ])
</span><span class="cx">
</span><ins>+dnl This macro ensures MP installation prefix paths are NOT in CFLAGS,
+dnl CPPFLAGS, OBJCFLAGS, LDFLAGS for configure to prevent potential problems
+dnl when base/ code is updated and ports are installed that would match needed
+dnl items.
+AC_DEFUN([MP_FLAGS_SCAN],[
+ AC_ARG_ENABLE(
+ [flag-sanitization],
+ AS_HELP_STRING([--disable-flag-sanitization], [Do not sanitize CPPFLAGS, CFLAGS, OBJCFLAGS and LDFLAGS]),
+ [disable_mp_flags_scan=yes],
+ [disable_mp_flags_scan=no])
+
+ if test x"$disable_mp_flags_scan" != "xyes"; then
+ # Get a value for $prefix
+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
+
+ mp_flags_scan_found=
+
+ # Clean CFLAGS CPPFLAGS OBJCFLAGS and LDFLAGS
+ for flagname in CFLAGS CPPFLAGS OBJCFLAGS LDFLAGS; do
+ mp_flags_scan_flag_cleaned=
+ eval "set x \$$flagname"
+ shift
+ for mp_flags_scan_val; do
+ case "$mp_flags_scan_val" in
+ -I$prefix/* | -L$prefix/*)
+ AC_MSG_NOTICE([Removing `$mp_flags_scan_val' from \$$flagname because it might cause a self-dependency])
+ mp_flags_scan_found=1
+ ; #(
+ *)
+ AS_VAR_APPEND([mp_flags_scan_flag_cleaned], [" $mp_flags_scan_val"])
+ ;
+ esac
+ done
+ if test -z "$mp_flags_scan_flag_cleaned"; then
+ (unset $flagname) >/dev/null 2>&1 && unset $flagname
+ else
+ eval "$flagname=\"$mp_flags_scan_flag_cleaned\""
+ fi
+ done
+
+ if ! test -z "$mp_flags_scan_found"; then
+ AC_MSG_NOTICE([See https://trac.macports.org/ticket/42756 for rationale on why this script is removing these values])
+ AC_MSG_NOTICE([Pass --disable-flag-sanitization if you're aware of the potential problems and want to risk them anyway])
+ fi
+
+ # Restore $prefix
+ prefix=$oldprefix
+ fi
+])
+
+
</ins><span class="cx"> dnl This macro ensures MP installation prefix paths are NOT in PATH
</span><span class="cx"> dnl for configure to prevent potential problems when base/ code is updated
</span><span class="cx"> dnl and ports are installed that would match needed items.
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (117726 => 117727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-03-09 20:45:45 UTC (rev 117726)
+++ trunk/base/configure.ac 2014-03-09 21:13:07 UTC (rev 117727)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx">
</span><span class="cx"> # Check user PATH for MP paths, and remove as necessary.
</span><span class="cx"> MP_PATH_SCAN
</span><ins>+MP_FLAGS_SCAN
</ins><span class="cx">
</span><span class="cx"> AC_PATH_PROG(SW_VERS, sw_vers)
</span><span class="cx"> AC_PATH_PROG(DEFAULTS, defaults)
</span></span></pre>
</div>
</div>
</body>
</html>