Date: Tue, 25 Mar 2014 15:40:13 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: Guido Falsi <madpilot@FreeBSD.org>, mat@FreeBSD.org, perl@FreeBSD.org Subject: Re: svn commit: r349107 - in head/converters/p5-Text-Iconv: . files Message-ID: <20140325154013.06cfd18a@kalimero.tijl.coosemans.org> In-Reply-To: <201403250723.s2P7N6cc052424@svn.freebsd.org> References: <201403250723.s2P7N6cc052424@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--MP_/axLHS=G3lpQ+4hx7Nh4JHbv Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Tue, 25 Mar 2014 07:23:06 +0000 (UTC) Guido Falsi wrote: > Author: madpilot > Date: Tue Mar 25 07:23:06 2014 > New Revision: 349107 > URL: http://svnweb.freebsd.org/changeset/ports/349107 > QAT: https://qat.redports.org/buildarchive/r349107/ > > Log: > Fix build on 10 and head when converters/libiconv is installed. > > Reported by: Mike Harding <mvharding@gmail.com> (via email) > Approved by: perl (mat) > > Added: > head/converters/p5-Text-Iconv/files/ > head/converters/p5-Text-Iconv/files/patch-Makefile.PL (contents, props changed) > Modified: > head/converters/p5-Text-Iconv/Makefile > > Modified: head/converters/p5-Text-Iconv/Makefile > ============================================================================== > --- head/converters/p5-Text-Iconv/Makefile Tue Mar 25 06:46:36 2014 (r349106) > +++ head/converters/p5-Text-Iconv/Makefile Tue Mar 25 07:23:06 2014 (r349107) > @@ -13,6 +13,15 @@ COMMENT= Perl interface to iconv() codes > USES= perl5 iconv > USE_PERL5= configure > CONFIGURE_ARGS+= INC="-I${LOCALBASE}/include" \ > - LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" > + LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \ > + ccflags="${CFLAGS}" > > -.include <bsd.port.mk> > +.include <bsd.port.pre.mk> > + > +post-patch: > +.if ${OSVERSION} >= 1000043 > + @${REINPLACE_CMD} 's|<iconv.h>|"/usr/include/iconv.h"|' \ > + ${WRKSRC}/Iconv.xs > +.endif > + > +.include <bsd.port.post.mk> Thanks, I received a PR about this yesterday: http://www.freebsd.org/cgi/query-pr.cgi?pr=187907 The OSVERSION check isn't correct though. It should be empty(ICONV_LIB). But, I've attached a patch that uses a different approach. You can make the port use /usr/include/iconv.h by replacing LOCALBASE in CONFIGURE_ARGS with ICONV_PREFIX. That fixes the build phase, during configure however, something(?) is still adding -I/usr/local/include to the command line so you still need -DLIBICONV_PLUG when empty(ICONV_LIB). The patch adds CFLAGS to INC in CONFIGURE_ARGS for this. You can verify this by adding verbose=1 to CONFIGURE_ARGS and running "make configure". Can perl@ review/approve this? --MP_/axLHS=G3lpQ+4hx7Nh4JHbv Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=p5-Text-Iconv.patch Index: converters/p5-Text-Iconv/Makefile =================================================================== --- converters/p5-Text-Iconv/Makefile (revision 349143) +++ converters/p5-Text-Iconv/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= Text-Iconv PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= converters perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,16 +13,7 @@ COMMENT= Perl interface to iconv() codes USES= perl5 iconv USE_PERL5= configure -CONFIGURE_ARGS+= INC="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \ - ccflags="${CFLAGS}" - -.include <bsd.port.pre.mk> - -post-patch: -.if ${OSVERSION} >= 1000043 - @${REINPLACE_CMD} 's|<iconv.h>|"/usr/include/iconv.h"|' \ - ${WRKSRC}/Iconv.xs -.endif +CONFIGURE_ARGS+=INC="-I${ICONV_PREFIX}/include ${CFLAGS}" \ + LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: converters/p5-Text-Iconv/files/patch-Makefile.PL =================================================================== --- converters/p5-Text-Iconv/files/patch-Makefile.PL (revision 349143) +++ converters/p5-Text-Iconv/files/patch-Makefile.PL (working copy) @@ -1,25 +0,0 @@ ---- Makefile.PL.orig 2007-10-17 16:06:22.000000000 +0200 -+++ Makefile.PL 2014-03-24 21:28:37.147481295 +0100 -@@ -90,6 +90,7 @@ - AUTHOR => 'Michael Piotrowski <mxp@dynalabs.de>') : ()), - 'LIBS' => $config{LIBS}, - 'DEFINE' => "@DEFINE", -+ 'CCFLAGS' => $config{ccflags}, - 'INC' => $config{INC}, - 'dist' => {COMPRESS => 'gzip', SUFFIX => 'gz'}, - ); -@@ -119,12 +120,12 @@ - { - # It is admittedly a bit simplistic to simply concatenate all - # flags, but it seems to work in most cases. -- $compile = join ' ', $Config{cc}, $incs, $Config{ccflags}, -+ $compile = join ' ', $Config{cc}, $incs, $config{ccflags}, - $Config{ldflags}, $libs; - } - else - { -- $compile = join ' ', $Config{cc}, $incs, $Config{ccflags}, $libs; -+ $compile = join ' ', $Config{cc}, $incs, $config{ccflags}, $libs; - } - - if (exists $config{verbose}) --MP_/axLHS=G3lpQ+4hx7Nh4JHbv--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140325154013.06cfd18a>