Date: Sat, 8 Oct 2011 00:01:17 +0000 (UTC) From: Stanislav Sedov <stas@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226124 - head/share/mk Message-ID: <201110080001.p9801H3p033460@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stas Date: Sat Oct 8 00:01:17 2011 New Revision: 226124 URL: http://svn.freebsd.org/changeset/base/226124 Log: - Add a couple of more sed subsitutions needed to get the correct libtool.m4. With these fixes libtool will correctly indentify the system as ELF (and not a.out). - While here, change the substitutions so they're still correctly match freebsd1.x, freebsd2.x etc. Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk ============================================================================== --- head/share/mk/bsd.port.mk Sat Oct 8 00:00:54 2011 (r226123) +++ head/share/mk/bsd.port.mk Sat Oct 8 00:01:17 2011 (r226124) @@ -20,8 +20,12 @@ _WITHOUT_SRCCONF= run-autotools-fixup: test -d ${WRKSRC} && 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)/' {} + || /usr/bin/true + -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ + -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ + -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ + -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ + -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ + {} + || /usr/bin/true .ORDER: run-autotools run-autotools-fixup do-configure do-configure: run-autotools-fixup
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110080001.p9801H3p033460>