svn commit: r388607 - head/databases/rocksdb

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Jun  5 18:56:58 2015
New Revision: 388607
URL: https://svnweb.freebsd.org/changeset/ports/388607

Log:
  - Disable SSE4.2 on i386 architecture to fix i386 builds on FreeBSD package building cluster
  - Cleanup Makefile: something forgot to removed before committing r388095

Modified:
  head/databases/rocksdb/Makefile

Modified: head/databases/rocksdb/Makefile
==============================================================================
--- head/databases/rocksdb/Makefile	Fri Jun  5 18:51:47 2015	(r388606)
+++ head/databases/rocksdb/Makefile	Fri Jun  5 18:56:58 2015	(r388607)
@@ -33,12 +33,9 @@ PROGRAMS=	db_bench db_repl_stress db_san
 CFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
-.if ${COMPILER_TYPE} == clang
-#CXXFLAGS+=	-Wno-shift-count-overflow
-.if ${COMPILER_VERSION} >= 36
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
 CXXFLAGS+=	-Wno-inconsistent-missing-override
 .endif
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile
@@ -46,8 +43,9 @@ post-patch:
 .if defined(WITHOUT_PROFILE)
 	@${REINPLACE_CMD} -e '/pg = / s| -pg||' ${WRKSRC}/Makefile
 .endif
-.if !defined(MACHINE_CPU:Msse42)
-#	@${REINPLACE_CMD} -e 's| -msse4.2||' ${WRKSRC}/build_tools/build_detect_platform
+# Disable SSE4.2 on i386 architecture to fix i386 builds on FreeBSD package building cluster
+.if ${ARCH} == i386
+	@${REINPLACE_CMD} -e 's|#ifdef __SSE4_2__|&DISABLED__|' ${WRKSRC}/util/crc32c.cc
 .endif
 
 do-install: