svn commit: r441826 - in head: databases/tarantool-c devel/rapidjson

[Alexey Dokuchaev]

Author: danfe
Date: Sat May 27 05:26:56 2017
New Revision: 441826
URL: https://svnweb.freebsd.org/changeset/ports/441826

Log:
  Respect CFLAGS: particularly, do not pass `-march=native' which some
  compilers do not like, which in turn might break the build.

Modified:
  head/databases/tarantool-c/Makefile
  head/devel/rapidjson/Makefile

Modified: head/databases/tarantool-c/Makefile
==============================================================================
--- head/databases/tarantool-c/Makefile	Sat May 27 04:38:03 2017	(r441825)
+++ head/databases/tarantool-c/Makefile	Sat May 27 05:26:56 2017	(r441826)
@@ -23,4 +23,7 @@ BROKEN_mips64=		Fails to compile: clang 
 BROKEN_powerpc64=	Fails to compile: clang compiler does not support -march=native
 BROKEN_sparc64=		Fails to compile: clang compiler does not support -march=native
 
+post-patch:
+	@${REINPLACE_CMD} -e '/-O3 -march=native/d' ${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>

Modified: head/devel/rapidjson/Makefile
==============================================================================
--- head/devel/rapidjson/Makefile	Sat May 27 04:38:03 2017	(r441825)
+++ head/devel/rapidjson/Makefile	Sat May 27 05:26:56 2017	(r441826)
@@ -20,8 +20,6 @@ BROKEN_armv6=		does not build: c++: erro
 BROKEN_sparc64=		does not build: c++: error: the clang compiler does not support -march=native
 BROKEN_powerpc64=	does not build: c++: error: the clang compiler does not support -march=native
 
-DOXYGEN_BUILD_DEPENDS+=	doxygen:devel/doxygen
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	miloyip
 
@@ -31,6 +29,7 @@ OPTIONS_DEFINE=	DOXYGEN EXAMPLES
 OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 OPTIONS_SUB=	yes
 
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CMAKE_ON=	-DRAPIDJSON_BUILD_DOC:BOOL=ON
 DOXYGEN_CMAKE_OFF=	-DRAPIDJSON_BUILD_DOC:BOOL=OFF
 EXAMPLES_CMAKE_ON=	-DRAPIDJSON_BUILD_EXAMPLES:BOOL=ON
@@ -44,7 +43,7 @@ DATADIR=	${PREFIX}/share/doc/RapidJSON
 PORTDATA=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"|' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"| ; s| -march=native||' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/example/CMakeLists.txt ${WRKSRC}/test/unittest/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|.*travis.*||' ${WRKSRC}/CMakeLists.txt   # travis_doc breaks cmake, see https://github.com/miloyip/rapidjson/issues/715
 	@${REINPLACE_CMD} -e 's|add_subdirectory.*googletest.*|link_directories(${LOCALBASE}/lib)|' ${WRKSRC}/test/CMakeLists.txt