diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2019-04-03 04:33:35 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2019-04-03 04:33:35 +0000 |
| commit | 6521bed65e88d73afcaa25ec286751da1b60fad3 (patch) | |
| tree | 1ce181c73775d5b696566fda1d3a0954a7e6a9d1 /graphics/opengv | |
| parent | 498bb75d3a88bc2d8a4a9c6995111daa9d8d5e94 (diff) | |
| download | ports-6521bed65e88d73afcaa25ec286751da1b60fad3.tar.gz ports-6521bed65e88d73afcaa25ec286751da1b60fad3.zip | |
Fix build on non-x86 architectures by conditionally turning off
-march=native.
Approved by: portmgr (tier-2 blanket)
Notes
Notes:
svn path=/head/; revision=497619
Diffstat (limited to 'graphics/opengv')
| -rw-r--r-- | graphics/opengv/Makefile | 9 | ||||
| -rw-r--r-- | graphics/opengv/files/extra-patch-CMakeLists.txt | 11 |
2 files changed, 19 insertions, 1 deletions
diff --git a/graphics/opengv/Makefile b/graphics/opengv/Makefile index bf5a740849df..c93667438ae5 100644 --- a/graphics/opengv/Makefile +++ b/graphics/opengv/Makefile @@ -26,4 +26,11 @@ do-test: ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +# disable march-native on non-x86 archs +.if ${ARCH} != amd64 && ${ARCH} != i386 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-CMakeLists.txt +.endif + +.include <bsd.port.post.mk> diff --git a/graphics/opengv/files/extra-patch-CMakeLists.txt b/graphics/opengv/files/extra-patch-CMakeLists.txt new file mode 100644 index 000000000000..e198d56a3ad1 --- /dev/null +++ b/graphics/opengv/files/extra-patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-10-25 03:22:02 UTC ++++ CMakeLists.txt +@@ -35,8 +35,6 @@ ELSE() + ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES + "(arm)|(ARM)|(armhf)|(ARMHF)|(armel)|(ARMEL)") + add_definitions (-march=armv7-a) +- ELSE () +- add_definitions (-march=native) #TODO use correct c++11 def once everybody has moved to gcc 4.7 # for now I even removed std=gnu++0x + ENDIF() + add_definitions ( + -O3 |