svn commit: r345514 - head/Mk/Uses

[Pietro Cerutti]

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/
> >>> 
> >>> 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?

> Index: devel/libghthash/Makefile
> ===================================================================
> --- devel/libghthash/Makefile	(revision 345586)
> +++ devel/libghthash/Makefile	(working copy)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	libghthash
>  PORTVERSION=	0.6.2
> -PORTREVISION=	2
> +PORTREVISION=	3
>  CATEGORIES=	devel
>  MASTER_SITES=	http://www.ipd.bth.se/ska/sim_home/filer/
>  
> @@ -14,7 +14,9 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
>  
>  USES=		libtool
>  GNU_CONFIGURE=	yes
> -CONFIGURE_ARGS=	--datarootdir=${PREFIX}
> +USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
> +AUTOMAKE_ARGS=	-a -c -f
> +LIBTOOLIZE_ARGS=-i -c -f
>  USE_LDCONFIG=	yes
>  
>  PLIST_FILES=	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!


-- 
Pietro Cerutti
The FreeBSD Project
gahr at FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 964 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140224/482bc09b/attachment.sig>