svn commit: r456578 - head/biology/hmmer

[Jan Beich]

Mark Linimon <linimon at 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+=	SSE2=""
> +.else
> +PLIST_SUB+=	SSE2="@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 
include/impl_dummy.h on non-x86 archs.

Index: biology/hmmer/Makefile
===================================================================
--- biology/hmmer/Makefile	(revision 456583)
+++ biology/hmmer/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	hmmer
 PORTVERSION=	3.1b2
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://eddylab.org/software/hmmer3/${PORTVERSION}/
 
@@ -27,6 +28,15 @@ EXAMPLES=	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
 
+CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}}
+CONFIGURE_ARGS_i386=	${"${MACHINE_CPU:Msse2}":?:"--disable-sse"}
+
+PLIST_SUB+=	${PLIST_SUB_${ARCH}} IMPL_CHOICE=dummy
+PLIST_SUB_amd64=IMPL_CHOICE=sse
+PLIST_SUB_i386=	IMPL_CHOICE=${"${MACHINE_CPU:Msse2}":?"sse":"dummy"}
+PLIST_SUB_powerpc64=	IMPL_CHOICE=vmx
+PLIST_SUB_powerpc=	IMPL_CHOICE=vmx
+
 post-build-TEST-on:	do-test
 
 post-install:
@@ -40,12 +50,4 @@ post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/tutorial/,} ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_CPU:Msse2}
-PLIST_SUB+=	SSE2=""
-.else
-PLIST_SUB+=	SSE2="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: biology/hmmer/pkg-plist
===================================================================
--- 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
-%%SSE2%%include/impl_sse.h
+include/impl_%%IMPL_CHOICE%%.h
 include/p7_config.h
 include/p7_gbands.h
 include/p7_gmxb.h
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 584 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20171218/849cda6d/attachment.sig>