svn commit: r307565 - head/net/silc-client

[Baptiste Daroussin]

On Sat, Nov 24, 2012 at 10:22:45PM -0500, Wesley Shields wrote:
> On Tue, Nov 20, 2012 at 12:17:00PM +0100, Baptiste Daroussin wrote:
> > I know I already told you the following, but I think it is worth saying it
> > loudly for other people who don't know yet about OPTIONS_DEFINE_${arch}
> > 
> > regards,
> > Bapt
> > 
> > On Mon, Nov 19, 2012 at 04:22:35PM +0000, Wesley Shields wrote:
> > > Author: wxs
> > > Date: Mon Nov 19 16:22:34 2012
> > > New Revision: 307565
> > > URL: http://svnweb.freebsd.org/changeset/ports/307565
> > > 
> > ...
> > >  WANT_PERL=	yes
> > >  
> > > -OPTIONS=	PTHREADS "Enable pthreads support" off \
> > > -		IPV6 "Enable IPv6 support" on \
> > > -		ICONV "Enable international character support" on \
> > > -		PERL "Enable perl support" on \
> > > -		OPTIMIZED_ASM "Use assembler optimizations (i386 only)" on
> > > +OPTIONS_DEFINE=	PTHREADS IPV6 ICONV PERL OPTIMIZED_ASM
> > > +PTHREADS_DESC=	"Enable pthreads support"
> > > +OPTIMIZED_ASM_DESC=	"Use assembler optimizations (i386 only)"
> > > +OPTIONS_DEFAULT=	IPV6 ICONV PERL OPTIMIZED_ASM
> > 
> > OPTIONS_DEFINE=	-PTHREADS IPV6 ICONV PERL
> > OPTIONS_DEFINE_i386=	OPTIMIZED_ASM
> > OPTIMIZED_ASM_DESC=	Use assembler optimizations
> > ...
> > > -.include <bsd.port.pre.mk>
> > > +.include <bsd.port.options.mk>
> > >  
> > >  .if ${ARCH} != "i386"
> > >  WITHOUT_OPTIMIZED_ASM=	yes
> > >  .endif
> > 
> > The above is uneeded as OPTIMIZED_ASM will never get defined with the _arch
> > syntax above.
> 
> Fixed all of these. Thanks for catching it and pointing me to the proper
> way to do it!
> 
> I do have one question. In r307732 I had to change ${PERL} to just
> 'perl' in the PERL_ARCHNAME!= line. This was working prior to the switch
> to the new options so I'm curious if I did something wrong or uncovered
> a bug?
> 
> -- WXS

This is because ${PERL} is set by USE_PERL5, which is included after
bsd.port.options.mk and you need it at the moment you parse the Makefile because
of:  PERL_ARCHNAME!=         ${PERL} -V:archname 2>/dev/null || true

so what you have to do is either:

.include <bsd.port.options.mk>
Some checking
.include <bsd.port.pre.mk>
here is ${PERL}
.include <bsd.port.post.mk>

or directly

.include <bsd.port.pre.mk>
Some checking

Here is ${PERL}
.include <bsd.port.post.mk>


Of course I haven't test the above

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20121125/97d1be7d/attachment-0001.sig>