From 8c16acd7670cf3a9e3056594d23d255bb0a0d55c Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 27 Dec 2017 08:02:58 +0000
Subject: [PATCH] Remove "-march=native" as a barrier to building on arm.

However, the builds still fail, but much farther along in the process.
So, this fix is necessary, but insufficient.

TODO: confirm the exact way rocksdb-lite fails on armv7 (I haven't run
that combination yet).

Approved by:	portmgr (tier-2 blanket)
---
 databases/rocksdb-lite/Makefile |  2 ++
 databases/rocksdb/Makefile      | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/databases/rocksdb-lite/Makefile b/databases/rocksdb-lite/Makefile
index 876a9fbf129f..ae2b3ac176a9 100644
--- a/databases/rocksdb-lite/Makefile
+++ b/databases/rocksdb-lite/Makefile
@@ -7,4 +7,6 @@ COMMENT=	Persistent key-value store for fast storage environments (lite version)
 LITE=		yes
 MASTERDIR=	${.CURDIR}/../rocksdb
 
+BROKEN_armv6=		does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int')
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 89a4761cfb3a..8ce92236b310 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -14,17 +14,14 @@ LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.Apache
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
-BROKEN_DragonFly=	does not build on DragonFly BSD using GCC with -Werror
-BROKEN_aarch64=	does not build: the clang compiler does not support -march=native
-BROKEN_armv6=	does not build: the clang compiler does not support -march=native
-BROKEN_armv7=	does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'`
-BROKEN_powerpc64=	does not build: the clang compiler does not support -march=native
-BROKEN_sparc64=	cannot build: uses unknown compiler flags
-
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libsnappy.so:archivers/snappy
 
+BROKEN_DragonFly=	does not build on DragonFly BSD using GCC with -Werror
+BROKEN_armv6?=		does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int')
+BROKEN_armv7?=		does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'`
+
 OPTIONS_DEFINE=	DEBUG LZ4 ZSTD
 OPTIONS_DEFAULT=LZ4
 
@@ -79,6 +76,9 @@ CFLAGS+=	-D_GLIBCXX_USE_C99
 post-patch:
 	@${REINPLACE_CMD} -e '/^dummy :=/d; /^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's| -fno-builtin-memcmp||; s| -ltcmalloc||' ${WRKSRC}/build_tools/build_detect_platform
+.if ${ARCH} != amd64 && ${ARCH} != i386
+	@${REINPLACE_CMD} -e 's| -march=native||' ${WRKSRC}/build_tools/build_detect_platform
+.endif
 	@${REINPLACE_CMD} -e 's|#include "gtest/gtest.h"|#include "gtest.h"|' ${WRKSRC}/third-party/gtest-1.7.0/fused-src/gtest/gtest-all.cc
 .if defined(WITHOUT_PROFILE)
 	@${REINPLACE_CMD} -e '/pg = / s| -pg||' ${WRKSRC}/Makefile