Date: Mon, 18 Dec 2017 04:32:40 +0100 From: Jan Beich <jbeich@FreeBSD.org> To: Mark Linimon <linimon@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r456578 - head/biology/hmmer Message-ID: <zi6g-u2w7-wny@FreeBSD.org> In-Reply-To: <201712180232.vBI2WlFi034525@repo.freebsd.org> (Mark Linimon's message of "Mon, 18 Dec 2017 02:32:47 %2B0000 (UTC)") References: <201712180232.vBI2WlFi034525@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Mark Linimon <linimon@FreeBSD.org> writes: > Author: linimon > Date: Mon Dec 18 02:32:47 2017 > New Revision: 456578 > URL: https://svnweb.freebsd.org/changeset/ports/456578 > > Log: > Attempt to fix build on non-x86 archs. Untested, but does no harm > on x86. [...] > -.include <bsd.port.mk> > +.include <bsd.port.pre.mk> > + > +.if ${MACHINE_CPU:Msse2} > +PLIST_SUB+=3D SSE2=3D"" > +.else > +PLIST_SUB+=3D SSE2=3D"@comment " > +.endif [...] > -include/impl_sse.h > +%%SSE2%%include/impl_sse.h Either bump PORTREVISION or restore include/impl_sse.h on i386. Given the port doesn't appear to consult CPUID before using SSE2 another option is to disable SSE2 on i386 without orphaning=20 include/impl_dummy.h on non-x86 archs. Index: biology/hmmer/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 =2D-- biology/hmmer/Makefile (revision 456583) +++ biology/hmmer/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D hmmer PORTVERSION=3D 3.1b2 +PORTREVISION=3D 1 CATEGORIES=3D biology MASTER_SITES=3D http://eddylab.org/software/hmmer3/${PORTVERSION}/ =20 @@ -27,6 +28,15 @@ EXAMPLES=3D 7LESS_DROME HBB_HUMAN MADE1.hmm MADE1.ou globins4.hmm globins4.out globins4.sto globins45.fa \ minifam minifam.h3f minifam.h3i minifam.h3m minifam.h3p =20 +CONFIGURE_ARGS+=3D${CONFIGURE_ARGS_${ARCH}} +CONFIGURE_ARGS_i386=3D ${"${MACHINE_CPU:Msse2}":?:"--disable-sse"} + +PLIST_SUB+=3D ${PLIST_SUB_${ARCH}} IMPL_CHOICE=3Ddummy +PLIST_SUB_amd64=3DIMPL_CHOICE=3Dsse +PLIST_SUB_i386=3D IMPL_CHOICE=3D${"${MACHINE_CPU:Msse2}":?"sse":"dummy"} +PLIST_SUB_powerpc64=3D IMPL_CHOICE=3Dvmx +PLIST_SUB_powerpc=3D IMPL_CHOICE=3Dvmx + post-build-TEST-on: do-test =20 post-install: @@ -40,12 +50,4 @@ post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/tutorial/,} ${STAGEDIR}${EXAMPLE= SDIR} =20 =2D.include <bsd.port.pre.mk> =2D =2D.if ${MACHINE_CPU:Msse2} =2DPLIST_SUB+=3D SSE2=3D"" =2D.else =2DPLIST_SUB+=3D SSE2=3D"@comment " =2D.endif =2D =2D.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: biology/hmmer/pkg-plist =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 =2D-- biology/hmmer/pkg-plist (revision 456583) +++ biology/hmmer/pkg-plist (working copy) @@ -20,7 +20,7 @@ bin/nhmmscan bin/phmmer include/cachedb.h include/hmmer.h =2D%%SSE2%%include/impl_sse.h +include/impl_%%IMPL_CHOICE%%.h include/p7_config.h include/p7_gbands.h include/p7_gmxb.h --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQF8BAEBCgBmBQJaNzbYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bORgH/0tmj2kT8EO4ZM/woFlAOJS2 QMWUKhB7MRTEFhAizHwLoylk4xbdsMKxY53A5mzmD+rMXe4ZaODR0j0FpTJAaV7/ ISBf9ojaMcS9sV9dBEob7w5XIbH9yeLh4TJeFHhQqfZD+sg21wa1H4UVrCKHkH8U i1FrsZh1+UAIrafOeRfH5GLAXHxHwr4TbnwuWRtRiykWkXLkcisT3IXYrFlW/hmL HBG2O5xvjLqaD/umnTBajXpsCo0gjzbxnesG9+jtVJj+N2CUkcD8J8stCQP2zb29 BfaXL1x6iRw3bbxxkXIUantsjKaNWRMbyA0CfUo6ch21RoE+sObzyCFHbflTVss= =xciL -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?zi6g-u2w7-wny>