Date: Sun, 25 Nov 2012 03:21:09 +0000 (UTC) From: Wesley Shields <wxs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307732 - head/net/silc-client Message-ID: <201211250321.qAP3L9O1084360@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wxs Date: Sun Nov 25 03:21:09 2012 New Revision: 307732 URL: http://svnweb.freebsd.org/changeset/ports/307732 Log: Rename OPTIMIZED_ASM option to just ASM. This one has a description in bsd.options.desc.mk. Fix build on i386 by partially reverting r307565. Only a partial revert because I worked around a bug where ${PERL} was not recognized after switching to new style options. Feature safe: yes Modified: head/net/silc-client/Makefile Modified: head/net/silc-client/Makefile ============================================================================== --- head/net/silc-client/Makefile Sat Nov 24 22:16:37 2012 (r307731) +++ head/net/silc-client/Makefile Sun Nov 25 03:21:09 2012 (r307732) @@ -34,10 +34,10 @@ CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --without-libtoolfix WANT_PERL= yes -OPTIONS_DEFINE= PTHREADS IPV6 ICONV PERL OPTIMIZED_ASM +OPTIONS_DEFINE= PTHREADS IPV6 ICONV PERL +OPTIONS_DEFINE_i386= ASM PTHREADS_DESC= Enable pthreads support -OPTIMIZED_ASM_DESC= Use assembler optimizations (i386 only) -OPTIONS_DEFAULT= IPV6 ICONV PERL OPTIMIZED_ASM +OPTIONS_DEFAULT= IPV6 ICONV PERL ASM .ifdef(IRSSI_PLUGIN) CONFIGURE_ARGS+= --with-silc-plugin=${PREFIX}/lib/irssi \ @@ -84,10 +84,6 @@ post-install: .include <bsd.port.options.mk> -.if ${ARCH} != "i386" -WITHOUT_OPTIMIZED_ASM= yes -.endif - .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif @@ -101,14 +97,15 @@ CONFIGURE_ARGS+= --without-iconv .if ${PORT_OPTIONS:MPERL} USE_PERL5= yes -PLIST_SUB+= WITH_PERL="" PERL_ARCHNAME="${ARCH}-freebsd" +PERL_ARCHNAME!= perl -V:archname +PLIST_SUB+= WITH_PERL="" PERL_ARCHNAME="${PERL_ARCHNAME:S/archname='//:S/';//}" CONFIGURE_ARGS+= --with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl .else CONFIGURE_ARGS+= --without-perl PLIST_SUB+= WITH_PERL="@comment " .endif -.if ${PORT_OPTIONS:MOPTIMIZED_ASM} +.if empty(${PORT_OPTIONS:MASM}) CONFIGURE_ARGS+= --disable-asm .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211250321.qAP3L9O1084360>