svn commit: r504086 - in head/databases/tarantool-c: . files
Mark Linimon
linimon at FreeBSD.org
Thu Jun 13 12:49:16 UTC 2019
Author: linimon
Date: Thu Jun 13 12:49:14 2019
New Revision: 504086
URL: https://svnweb.freebsd.org/changeset/ports/504086
Log:
Patch out a CFLAG definition on GCC-based systems to prevent the
following error:
cc1: error: unrecognized command line option "-Wno-implicit-fallthrough"
The CMakeLists.txt file is sufficiently complicated that this seemed
like the cleanest approach.
Approved by: portmgr (tier-2 blanket)
Added:
head/databases/tarantool-c/files/
head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt (contents, props changed)
Modified:
head/databases/tarantool-c/Makefile
Modified: head/databases/tarantool-c/Makefile
==============================================================================
--- head/databases/tarantool-c/Makefile Thu Jun 13 12:49:09 2019 (r504085)
+++ head/databases/tarantool-c/Makefile Thu Jun 13 12:49:14 2019 (r504086)
@@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE
LIB_DEPENDS= libmsgpuck.so:devel/msgpuck
-USES= cmake
+USES= cmake compiler
CMAKE_OFF= ENABLE_BUNDLED_DOCS ENABLE_BUNDLED_MSGPUCK
@@ -23,4 +23,10 @@ GH_TAGNAME= d93096a
post-patch:
@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tnt_CMakeLists.txt
+.endif
+
+.include <bsd.port.post.mk>
Added: head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt Thu Jun 13 12:49:14 2019 (r504086)
@@ -0,0 +1,14 @@
+--- tnt/CMakeLists.txt.orig 2019-02-21 14:33:51 UTC
++++ tnt/CMakeLists.txt
+@@ -49,8 +49,9 @@ set (TNT_SOURCES
+ # Builds
+ #----------------------------------------------------------------------------#
+
+-set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES
+- COMPILE_FLAGS "-Wno-implicit-fallthrough")
++# -Wno-implicit-fallthrough only has meaning for llvm
++#set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES
++# COMPILE_FLAGS "-Wno-implicit-fallthrough")
+
+ ## Static library
+ project(tnt)
More information about the svn-ports-all
mailing list