svn commit: r226027 - head/share/mk
Jilles Tjoelker
jilles at FreeBSD.org
Tue Oct 4 22:23:01 UTC 2011
Author: jilles
Date: Tue Oct 4 22:23:00 2011
New Revision: 226027
URL: http://svn.freebsd.org/changeset/base/226027
Log:
Work around the autotools problem with the 10.0 version.
With this, I can build various ports on a 10.0-CURRENT system without
hacking or hiding the version number.
This commit should be reverted when there is a cleaner fix in autotools
and/or ports/Mk/bsd.port.mk.
The original patch is from Ed Schouten but needed some additions.
Modified:
head/share/mk/bsd.port.mk
Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk Tue Oct 4 21:40:25 2011 (r226026)
+++ head/share/mk/bsd.port.mk Tue Oct 4 22:23:00 2011 (r226027)
@@ -14,3 +14,15 @@ _WITHOUT_SRCCONF=
.include <bsd.own.mk>
.include "${BSDPORTMK}"
+
+.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
+# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
+run-autotools-fixup:
+ find ${WRKSRC} -type f \( -name config.libpath -o \
+ -name config.rpath -o -name configure -o -name libtool.m4 \) \
+ -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \
+ -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} +
+
+.ORDER: run-autotools run-autotools-fixup do-configure
+do-configure: run-autotools-fixup
+.endif
More information about the svn-src-all
mailing list