Date: Mon, 24 Feb 2014 08:43:00 +0100 From: Pietro Cerutti <gahr@FreeBSD.org> To: Tijl Coosemans <tijl@FreeBSD.org> Cc: svn-ports-head@freebsd.org, Baptiste Daroussin <bapt@FreeBSD.org>, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r345514 - head/Mk/Uses Message-ID: <20140224074300.GC17753@gahrfit.gahr.ch> In-Reply-To: <20140222174912.5aeef551@kalimero.tijl.coosemans.org> References: <201402211647.s1LGlTuw053335@svn.freebsd.org> <20140221194949.29595e47@kalimero.tijl.coosemans.org> <20140221193004.GM1699@ithaqua.etoilebsd.net> <20140222174912.5aeef551@kalimero.tijl.coosemans.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--7gGkHNMELEOhSGF6 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2014-Feb-22, 17:49, Tijl Coosemans wrote: > 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/ > >>>=20 > >>> Log: > >>> libtool 1.4.2a was defining the shared extension as shrext_cmds, re= name it shared_ext > >>> like in newer libtool so the rest of USES=3Diconv magic just works > >>>=20 > >>> Modified: > >>> head/Mk/Uses/libtool.mk > >>>=20 > >>> Modified: head/Mk/Uses/libtool.mk > >>> =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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > >>> --- 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_]*=3D/s/=3Dunknown/=3Dno/' \ > >>> -e '/objformat=3D/s/echo aout/echo elf/' \ > >>> -e "/freebsd-elf\\*)/,/;;/ { \ > >>> - /deplibs_check_method=3D/s/=3D.*/=3Dpass_all/; }" > >>> + /deplibs_check_method=3D/s/=3D.*/=3Dpass_all/; }" \ > >>> + -e "s/shrext_cmds/shared_ext/g" > >>> =20 > >>> .if ! ${libtool_ARGS:Moldver} > >>> @${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \) \ > >>=20 > >> 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=3D\"$shrext_cm= ds\"'. > >>=20 > >> What port does this fix? > >=20 > > devel/libghthash is the port broken if you end up with a better fix, > > please just commit. >=20 > 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. >=20 > Patch attached. Pietro, can you approve it? > 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 \ I barely know what all those tools are for, but this does fix the issue indeed, so please go ahead. Thanks a lot! --=20 Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp --7gGkHNMELEOhSGF6 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQJ8BAEBCgBmBQJTCvgAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQTZERTEwNkE1Qjg1NEI4NUREODZENDlB REQwRDM4RUExOTIwODlFAAoJEK3Q046hkgieerYQAIJZkuqyUe8NpNs4x20GAjNY AkLX0QhLdk9DJKC5aHRK+dZGXzYVyFBmOth70xagHwghSZCpSlYirMy7bq+GNILJ qFKh5bieDPkZxzlBN57amkkSTTT/fJ+NKz8Ij7x8qv+EO0XKSQ9WURspgCP5cw0m fMDR+lPt1vIEsvV/3BDOoO9vbz8vsAs+yqL+poQA6Z3Hkbv05+AX9Rz4t3yuPw6t 46YqpZNv1czdM8xYPuzu0J+7oa+O8vMZD+ZYrLSpAo25FUmbPbC3EsKMiJYME3Zg oUGW3zsuq8PnTQB6zHuDgw+Hj2yqPKNOk7MIyqFnz1jjjrKZoyo1Jos0YQwi6ita 0kmRr9k73IzuQW127VHb+JYl08WstA50vUe8FJ7ykOguHJ4X405W5+FvDJdqWJe6 flhU5RcvQG5S8AL8bstu51bwOKzDuz5ZetsHE+evEPjmvXI5oz7Al3u3Ux6KDmYU af8YexE78bl9/Vm0nCMLgY0jf0jU9O0GCdbKNMfV5hLKgel/kmFVnPHEHcvjaviT pe4e1+AW5nc7CD5mT1N9hFlcB8iGV5qsB8Uw9E2mThDpLrZ3ir2Y56i+Dz8Dw0Zx DiIxi8T63SLMjug9/dzQiDx4kG14njU9jx5FxDUwtESnIwpe3B/CldM/thxL21tk 6/Mq85vQP68T/I7JOKUy =ut6j -----END PGP SIGNATURE----- --7gGkHNMELEOhSGF6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140224074300.GC17753>