Date: Mon, 3 Mar 2014 15:42:44 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: Koop Mast <kwm@rainbow-runner.nl> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r346763 - head/Mk/Uses Message-ID: <20140303154244.7f9f52e1@kalimero.tijl.coosemans.org> In-Reply-To: <53143FA2.2040509@rainbow-runner.nl> References: <201403021314.s22DE7UH078623@svn.freebsd.org> <53143FA2.2040509@rainbow-runner.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 03 Mar 2014 09:38:58 +0100 Koop Mast wrote: > On 2-3-2014 14:14, Tijl Coosemans wrote: >> Author: tijl >> Date: Sun Mar 2 13:14:07 2014 >> New Revision: 346763 >> URL: http://svnweb.freebsd.org/changeset/ports/346763 >> QAT: https://qat.redports.org/buildarchive/r346763/ >> >> Log: >> In libtool.mk, let the regexp for DragonFly BSD support match both >> "freebsd*)" and "freebsd* ", and add "dragonfly*" only if it isn't there >> already. >> >> Approved by: bapt >> >> Modified: >> head/Mk/Uses/libtool.mk >> >> Modified: head/Mk/Uses/libtool.mk >> ============================================================================== >> --- head/Mk/Uses/libtool.mk Sun Mar 2 13:13:27 2014 (r346762) >> +++ head/Mk/Uses/libtool.mk Sun Mar 2 13:14:07 2014 (r346763) >> @@ -19,10 +19,10 @@ _INCLUDE_USES_LIBTOOL_POST_MK= yes >> patch-libtool: >> @${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \) \ >> -type f | ${XARGS} ${REINPLACE_CMD} \ >> + -e '/dragonfly\*/!s/freebsd\*[ )]/dragonfly* | &/' \ >> -e '/gcc_dir=\\`/s/gcc /$$CC /' \ >> -e '/gcc_ver=\\`/s/gcc /$$CC /' \ >> -e '/link_all_deplibs[0-9A-Z_]*=/s/=unknown/=no/' \ >> - -e 's,freebsd\*),freebsd\*|dragonfly\*),g' \ >> -e '/objformat=/s/echo aout/echo elf/' \ >> -e "/freebsd-elf\\*)/,/;;/ { \ >> /deplibs_check_method=/s/=.*/=pass_all/; }" > > Hi, > this seems to break sysutils/hal configure stage, could you take a look > at the following PR? It also has a proposed patch for the problem. > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187208 I've committed a small fix now, but I'm not entirely happy with it. Ideally, all these sed commands would be enclosed by /begin/,/end/ { ... } where /begin/ and /end/ mark the libtool section of a configure script. It looks like /file_magic_test_file=$/ could be used for /begin/, but I can't find one for /end/.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140303154244.7f9f52e1>