svn commit: r494785 - head/devel/rapidjson

[Tobias Kortkamp]

Author: tobik
Date: Wed Mar  6 09:17:12 2019
New Revision: 494785
URL: https://svnweb.freebsd.org/changeset/ports/494785

Log:
  devel/rapidjson: Fix build with Clang 8
  
  include/rapidjson/schema.h:1729:68: error: empty expression statement has no effect; remove unnecessary ';' to silence this warning [-Werror,-Wextra-semi-stmt]
          RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
                                                                     ^
  
  New warnings in Clang => new errors in devel/rapidjson due to the
  build having -Werror with -Wall and -Wextra.  This has also happened
  during previous Clang version bumps.  Instead of collecting new
  -Wno-* every time, disable use of -Werror entirely similar to what
  the port already does on tier 2 archs.
  
  PR:		236206
  Reported by:	jbeich
  Approved by:	portmgr blanket

Modified:
  head/devel/rapidjson/Makefile

Modified: head/devel/rapidjson/Makefile
==============================================================================
--- head/devel/rapidjson/Makefile	Wed Mar  6 09:00:55 2019	(r494784)
+++ head/devel/rapidjson/Makefile	Wed Mar  6 09:17:12 2019	(r494785)
@@ -34,24 +34,14 @@ EXAMPLES_CMAKE_BOOL=	RAPIDJSON_BUILD_EXAMPLES
 DATADIR=	${PREFIX}/share/doc/RapidJSON
 PORTDATA=	*
 
-.include <bsd.port.pre.mk>
+CXXFLAGS+=	-Wno-error
 
-CXXFLAGS+=	-Wno-c++98-compat # for EXAMPLES option, due to this bug: https://github.com/miloyip/rapidjson/issues/761
-CXXFLAGS_powerpc=	-Wno-error
-CXXFLAGS_powerpcspe=	-Wno-error
-CXXFLAGS_powerpc64=	-Wno-error
-CXXFLAGS_sparc64=	-Wno-error
-.if ${CHOSEN_COMPILER_TYPE} == clang
-CXXFLAGS+=	-Wno-zero-as-null-pointer-constant
-.endif
-
 post-patch:
 	@${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
 
 post-install:
 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/CMake*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>