svn commit: r457351 - in head: audio/zita-convolver audio/zita-convolver/files biology/phyml games/trigger-rally games/trigger-rally/files

[Mark Linimon]

Author: linimon
Date: Wed Dec 27 07:36:05 2017
New Revision: 457351
URL: https://svnweb.freebsd.org/changeset/ports/457351

Log:
  Disable the extra flag "-march=native" on arm to fix builds.
  
  Approved by:	portmgr (tier-2 blanket)
  Obtained from:	lonesome.com -exp run

Modified:
  head/audio/zita-convolver/Makefile
  head/audio/zita-convolver/files/patch-Makefile
  head/biology/phyml/Makefile
  head/games/trigger-rally/Makefile
  head/games/trigger-rally/files/patch-GNUmakefile

Modified: head/audio/zita-convolver/Makefile
==============================================================================
--- head/audio/zita-convolver/Makefile	Wed Dec 27 07:04:51 2017	(r457350)
+++ head/audio/zita-convolver/Makefile	Wed Dec 27 07:36:05 2017	(r457351)
@@ -16,9 +16,9 @@ LICENSE_FILE=	${WRKSRC}/../COPYING
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
-BROKEN_aarch64=		fails to compile: c++: the clang compiler does not support '-march=native'
-BROKEN_armv6=		fails to compile: c++: the clang compiler does not support '-march=native'
-BROKEN_armv7=		fails to compile: c++: the clang compiler does not support '-march=native'
+#BROKEN_aarch64=		fails to compile: c++: the clang compiler does not support '-march=native'
+#BROKEN_armv6=		fails to compile: c++: the clang compiler does not support '-march=native'
+#BROKEN_armv7=		fails to compile: c++: the clang compiler does not support '-march=native'
 
 USES=		compiler:c++11-lib gmake localbase:ldflags tar:bz2
 USE_LDCONFIG=	yes

Modified: head/audio/zita-convolver/files/patch-Makefile
==============================================================================
--- head/audio/zita-convolver/files/patch-Makefile	Wed Dec 27 07:04:51 2017	(r457350)
+++ head/audio/zita-convolver/files/patch-Makefile	Wed Dec 27 07:36:05 2017	(r457351)
@@ -11,6 +11,15 @@
  
  
  MAJVERS = 3
+@@ -33,7 +33,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE 
+ CXXFLAGS += -fPIC -Wall
+ CXXFLAGS += -ffast-math -funroll-loops -O3
+-CXXFLAGS += -march=native
++#CXXFLAGS += -march=native
+ LDLFAGS += 
+ LDLIBS +=
+ 
 @@ -45,9 +45,10 @@ ZITA-CONVOLVER_DEP = -lfftw3f -lpthread
  ZITA-CONVOLVER_O = zita-convolver.o
  ZITA-CONVOLVER_H = zita-convolver.h 

Modified: head/biology/phyml/Makefile
==============================================================================
--- head/biology/phyml/Makefile	Wed Dec 27 07:04:51 2017	(r457350)
+++ head/biology/phyml/Makefile	Wed Dec 27 07:36:05 2017	(r457351)
@@ -13,9 +13,9 @@ COMMENT=	Simple, fast, and accurate algorithm to estim
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=		fails to compile: c++: the clang compiler does not support '-march=native'
-BROKEN_armv6=		fails to compile: c++: the clang compiler does not support '-march=native'
-BROKEN_armv7=		fails to compile: c++: the clang compiler does not support '-march=native'
+#BROKEN_aarch64=		fails to compile: c++: the clang compiler does not support '-march=native'
+#BROKEN_armv6=		fails to compile: c++: the clang compiler does not support '-march=native'
+#BROKEN_armv7=		fails to compile: c++: the clang compiler does not support '-march=native'
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stephaneguindon
@@ -50,6 +50,9 @@ BIN_SUFFIX=		# none
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-O2 .* $${ARCH_flag}|$${CFLAGS}|' ${WRKSRC}/configure.ac
+.if ${ARCH} != amd64 && ${ARCH} != i386
+	@${REINPLACE_CMD} -e 's|VECTOR_FLAG=-march=native|dnl &|' ${WRKSRC}/configure.ac
+.endif
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/utilities.h
 
 post-install-DOCS-on:

Modified: head/games/trigger-rally/Makefile
==============================================================================
--- head/games/trigger-rally/Makefile	Wed Dec 27 07:04:51 2017	(r457350)
+++ head/games/trigger-rally/Makefile	Wed Dec 27 07:36:05 2017	(r457351)
@@ -15,10 +15,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libphysfs.so:devel/physfs
 LIB_DEPENDS+=	libalut.so:audio/freealut
 
-BROKEN_aarch64=		fails to compile: error: the clang compiler does not support -march=native
-BROKEN_armv6=		fails to compile: error: the clang compiler does not support -march=native
-BROKEN_armv7=		fails to compile: error: the clang compiler does not support -march=native
-BROKEN_powerpc64=	fails to compile: error: the clang compiler does not support -march=native
+#BROKEN_aarch64=		fails to compile: error: the clang compiler does not support -march=native
+#BROKEN_armv6=		fails to compile: error: the clang compiler does not support -march=native
+#BROKEN_armv7=		fails to compile: error: the clang compiler does not support -march=native
+#BROKEN_powerpc64=	fails to compile: error: the clang compiler does not support -march=native
 
 WRKSRC_SUBDIR=	src
 USES=		gmake openal:al,alut

Modified: head/games/trigger-rally/files/patch-GNUmakefile
==============================================================================
--- head/games/trigger-rally/files/patch-GNUmakefile	Wed Dec 27 07:04:51 2017	(r457350)
+++ head/games/trigger-rally/files/patch-GNUmakefile	Wed Dec 27 07:36:05 2017	(r457351)
@@ -1,5 +1,14 @@
 --- GNUmakefile.orig	2016-11-05 17:27:10 UTC
 +++ GNUmakefile
+@@ -21,7 +21,7 @@ SRCFILES        := $(shell find $(PROJDI
+ OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
+ DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
+ WARNINGS        ?= -Wall -Wextra -pedantic
+-OPTIMS          ?= -march=native -mtune=native -Ofast
++OPTIMS          ?= -mtune=native -Ofast
+ DMACROS         := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
+ INCDIRS         := -I'./include'
+ CXXFLAGS        += -std=c++11 $(WARNINGS) $(OPTIMS)
 @@ -125,7 +125,7 @@ $(TR_EXEFILE): $(OBJFILES)
  		printf "\t%s\n" $$file; \
  		done;