Date: Sat, 22 Feb 2014 17:49:12 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, gahr@FreeBSD.org, ports-committers@freebsd.org Subject: Re: svn commit: r345514 - head/Mk/Uses Message-ID: <20140222174912.5aeef551@kalimero.tijl.coosemans.org> In-Reply-To: <20140221193004.GM1699@ithaqua.etoilebsd.net> References: <201402211647.s1LGlTuw053335@svn.freebsd.org> <20140221194949.29595e47@kalimero.tijl.coosemans.org> <20140221193004.GM1699@ithaqua.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--MP_/TOIGnAv49GRlOI0MBkgZjM2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Fri, 21 Feb 2014 20:30:04 +0100 Baptiste Daroussin wrote: > On Fri, Feb 21, 2014 at 07:49:49PM +0100, Tijl Coosemans wrote: >> On Fri, 21 Feb 2014 16:47:29 +0000 (UTC) Baptiste Daroussin wrote: >>> Author: bapt >>> Date: Fri Feb 21 16:47:29 2014 >>> New Revision: 345514 >>> URL: http://svnweb.freebsd.org/changeset/ports/345514 >>> QAT: https://qat.redports.org/buildarchive/r345514/ >>> >>> Log: >>> libtool 1.4.2a was defining the shared extension as shrext_cmds, rename it shared_ext >>> like in newer libtool so the rest of USES=iconv magic just works >>> >>> Modified: >>> head/Mk/Uses/libtool.mk >>> >>> Modified: head/Mk/Uses/libtool.mk >>> ============================================================================== >>> --- head/Mk/Uses/libtool.mk Fri Feb 21 16:04:38 2014 (r345513) >>> +++ head/Mk/Uses/libtool.mk Fri Feb 21 16:47:29 2014 (r345514) >>> @@ -22,7 +22,8 @@ patch-libtool: >>> -e '/link_all_deplibs[0-9A-Z_]*=/s/=unknown/=no/' \ >>> -e '/objformat=/s/echo aout/echo elf/' \ >>> -e "/freebsd-elf\\*)/,/;;/ { \ >>> - /deplibs_check_method=/s/=.*/=pass_all/; }" >>> + /deplibs_check_method=/s/=.*/=pass_all/; }" \ >>> + -e "s/shrext_cmds/shared_ext/g" >>> >>> .if ! ${libtool_ARGS:Moldver} >>> @${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \) \ >> >> Both shrext_cmds and shared_ext exist so I'm not sure it's safe to use >> only one name. shrext_cmds is defined by configure (normally just .so >> for us) or by libtool when invoked with -shrext some_extension. Then >> later libtool defines shared_ext using 'eval shared_ext=\"$shrext_cmds\"'. >> >> What port does this fix? > > devel/libghthash is the port broken if you end up with a better fix, > please just commit. It looks like the configure script in that port is generated with macros from a newer version of libtool than the ltmain.sh script. I suggest to fix the port instead by running libtoolize. Because our libtool is an even more recent version this also requires running aclocal and autoconf. There's also a warning during configure about the 'missing' script being out of date so also run automake. Patch attached. Pietro, can you approve it? --MP_/TOIGnAv49GRlOI0MBkgZjM2 Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=libghthash.patch Index: devel/libghthash/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/libghthash/Makefile (revision 345586) +++ devel/libghthash/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D libghthash PORTVERSION=3D 0.6.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D devel MASTER_SITES=3D http://www.ipd.bth.se/ska/sim_home/filer/ =20 @@ -14,7 +14,9 @@ OPTIONS_DEFINE=3D DOCS EXAMPLES =20 USES=3D libtool GNU_CONFIGURE=3D yes -CONFIGURE_ARGS=3D --datarootdir=3D${PREFIX} +USE_AUTOTOOLS=3D aclocal autoheader automake autoconf libtoolize +AUTOMAKE_ARGS=3D -a -c -f +LIBTOOLIZE_ARGS=3D-i -c -f USE_LDCONFIG=3D yes =20 PLIST_FILES=3D include/ght_hash_table.h \ --MP_/TOIGnAv49GRlOI0MBkgZjM2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140222174912.5aeef551>