diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2019-06-26 04:51:43 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2019-06-26 04:51:43 +0800 |
| commit | 41e59546e1fd6478d8e0845f07beb910cd6c3d2e (patch) | |
| tree | 3cf2dbe513587a66eb9154489915316cd24a3588 /databases | |
| parent | ef0844d0f2590a657d356ef8993152606b189bff (diff) | |
| download | freebsd-ports-gnome-41e59546e1fd6478d8e0845f07beb910cd6c3d2e.tar.gz freebsd-ports-gnome-41e59546e1fd6478d8e0845f07beb910cd6c3d2e.tar.zst freebsd-ports-gnome-41e59546e1fd6478d8e0845f07beb910cd6c3d2e.zip | |
Update r504086: use an unconditional patch which could be merged upstream
Tested by: linimon
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/tarantool-c/Makefile | 8 | ||||
| -rw-r--r-- | databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt | 14 | ||||
| -rw-r--r-- | databases/tarantool-c/files/patch-tnt_CMakeLists.txt | 15 |
3 files changed, 16 insertions, 21 deletions
diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile index eae4d49f5660..ff93107613f7 100644 --- a/databases/tarantool-c/Makefile +++ b/databases/tarantool-c/Makefile @@ -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> diff --git a/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt b/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt deleted file mode 100644 index 79f7dd66c15c..000000000000 --- a/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt +++ /dev/null @@ -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) diff --git a/databases/tarantool-c/files/patch-tnt_CMakeLists.txt b/databases/tarantool-c/files/patch-tnt_CMakeLists.txt new file mode 100644 index 000000000000..62fe4f8eb936 --- /dev/null +++ b/databases/tarantool-c/files/patch-tnt_CMakeLists.txt @@ -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) |