Date: Sun, 9 Feb 2014 22:00:36 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343547 - head/Mk/Uses Message-ID: <201402092200.s19M0aP6048843@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Feb 9 22:00:35 2014 New Revision: 343547 URL: http://svnweb.freebsd.org/changeset/ports/343547 QAT: https://qat.redports.org/buildarchive/r343547/ Log: - Support libtool 1.3 which has an ltconfig script. - Support -shrext command line option. (Used in audio/pd.) Modified: head/Mk/Uses/libtool.mk Modified: head/Mk/Uses/libtool.mk ============================================================================== --- head/Mk/Uses/libtool.mk Sun Feb 9 21:55:52 2014 (r343546) +++ head/Mk/Uses/libtool.mk Sun Feb 9 22:00:35 2014 (r343547) @@ -17,18 +17,24 @@ libtool_ARGS?= _INCLUDE_USES_LIBTOOL_POST_MK= yes patch-libtool: - @${FIND} ${WRKDIR} -type f -name configure | \ - ${XARGS} ${REINPLACE_CMD} \ + @${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \) \ + -type f | ${XARGS} ${REINPLACE_CMD} \ -e '/link_all_deplibs=/s/=unknown/=no/' \ -e '/objformat=/s/echo aout/echo elf/' .if ! ${libtool_ARGS:Moldver} - @${FIND} ${WRKDIR} -type f -name configure | \ - ${XARGS} ${REINPLACE_CMD} \ - -e "/freebsd-elf\*)/,+1 s/library_names_spec=.*/ \ - library_names_spec='\$$libname\$$release.so\$$versuffix \ - \$$libname\$$release.so\$$major \$$libname.so' \ - soname_spec='\$$libname\$$release.so\$$major'/" + @${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \) \ + -type f | ${XARGS} ${REINPLACE_CMD} \ + -e "/freebsd-elf\\*)/,/;;/ { \ + /library_names_spec=.*\\.so/ \ + s/=.*/='\$$libname\$$release.so\$$versuffix \ + \$$libname\$$release.so\$$major \$$libname.so' \ + soname_spec='\$$libname\$$release.so\$$major'/; \ + /library_names_spec=.*shared_ext/ \ + s/=.*/='\$$libname\$$release\$$shared_ext\$$versuffix \ + \$$libname\$$release\$$shared_ext\$$major \ + \$$libname\$$shared_ext' \ + soname_spec='\$$libname\$$release\$$shared_ext\$$major'/; }" @${FIND} ${WRKDIR} -type f -name ltmain.sh | \ ${XARGS} ${REINPLACE_CMD} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402092200.s19M0aP6048843>