svn commit: r457353 - in head/databases: rocksdb rocksdb-lite

[Mark Linimon]

Author: linimon
Date: Wed Dec 27 08:02:58 2017
New Revision: 457353
URL: https://svnweb.freebsd.org/changeset/ports/457353

Log:
  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)

Modified:
  head/databases/rocksdb-lite/Makefile
  head/databases/rocksdb/Makefile

Modified: head/databases/rocksdb-lite/Makefile
==============================================================================
--- head/databases/rocksdb-lite/Makefile	Wed Dec 27 07:47:30 2017	(r457352)
+++ head/databases/rocksdb-lite/Makefile	Wed Dec 27 08:02:58 2017	(r457353)
@@ -7,4 +7,6 @@ COMMENT=	Persistent key-value store for fast storage e
 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"

Modified: head/databases/rocksdb/Makefile
==============================================================================
--- head/databases/rocksdb/Makefile	Wed Dec 27 07:47:30 2017	(r457352)
+++ head/databases/rocksdb/Makefile	Wed Dec 27 08:02:58 2017	(r457353)
@@ -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