<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/a6f94b5f14f9ebd32e257dca4f5ed72551758b6c">https://github.com/macports/macports-base/commit/a6f94b5f14f9ebd32e257dca4f5ed72551758b6c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a6f94b5f14f9ebd32e257dca4f5ed72551758b6c
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Jun 14 16:00:43 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> aclocal.m4: Run distclean before config in subdirs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some of our vendored dependencies are not reconfigure-safe without
</span><span style='display:block; white-space:pre;color:#404040;'> a distclean when changing, for example, --prefix. Specifically, this
</span><span style='display:block; white-space:pre;color:#404040;'> applies to Tcl, which does not recompile some of the files that contain
</span><span style='display:block; white-space:pre;color:#404040;'> the hardcoded prefix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This leads to incorrect behavior when such a reconfigured MacPorts build
</span><span style='display:block; white-space:pre;color:#404040;'> directory is installed – the bundled Tcl interpreter may end up loading
</span><span style='display:block; white-space:pre;color:#404040;'> its packages from the previously configured --prefix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid this by always running 'make distclean' in the build directory
</span><span style='display:block; white-space:pre;color:#404040;'> before running configure, but ignoring any errors, e.g. if the tree was
</span><span style='display:block; white-space:pre;color:#404040;'> not yet configured, or no distclean target exists in the Makefile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-base/pull/79 and
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-base/pull/80 for previous
</span><span style='display:block; white-space:pre;color:#404040;'> discussion of the issue.
</span>---
aclocal.m4 | 8 ++++++++
1 file changed, 8 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aclocal.m4 b/aclocal.m4
</span><span style='display:block; white-space:pre;color:#808080;'>index 99d87eca..776c96a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,6 +125,14 @@ AC_DEFUN([MP_CONFIG_SUBDIR], [
</span> if test "$no_recursion" != yes || test ! -f "$ac_srcdir/config.status"; then
AC_MSG_NOTICE([=== configuring in $ac_dir ($mp_popdir/$ac_dir)])
if test -f "$ac_srcdir/configure"; then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Run 'make distclean' first, ignoring errors; unfortunately some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of our projects are not reconfigure-safe and will not correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pick up modified configure variables or recompile files affected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # by such variables. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-base/pull/79 and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-base/pull/80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make distclean || true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> mp_sub_configure_args=
mp_sub_configure_keys=
# Compile a list of keys that have been given to the MP_CONFIG_SUBDIR
</pre><pre style='margin:0'>
</pre>