Update r504086: use an unconditional patch which could be merged upstream

Tested by: linimon
2019-06-25 20:51:43 +00:00
parent e4b9232b2f
commit b1db263c43
3 changed files with 16 additions and 21 deletions
@@ -25,10 +25,4 @@ post-patch:
 	@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
 	@${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake

-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tnt_CMakeLists.txt
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
@@ -1,14 +0,0 @@
--- 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)
@@ -0,0 +1,15 @@
+--- tnt/CMakeLists.txt.orig	2019-06-14 13:13:47 UTC
+++ tnt/CMakeLists.txt
+@@ -49,8 +49,10 @@ set (TNT_SOURCES
+ # Builds
+ #----------------------------------------------------------------------------#
+ 
+-set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES
+-    COMPILE_FLAGS "-Wno-implicit-fallthrough")
+if(CMAKE_COMPILER_IS_CLANG AND NOT CMAKE_COMPILER_IS_GNUCC)
+    set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES
+        COMPILE_FLAGS "-Wno-implicit-fallthrough")
+endif()
+ 
+ ## Static library
+ project(tnt)