diff options
Diffstat (limited to 'libraries/libmusicbrainz5')
| -rw-r--r-- | libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild | 3 | ||||
| -rw-r--r-- | libraries/libmusicbrainz5/no_wildcards.patch | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild b/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild index 7ffe5dde0c..bb3afb2772 100644 --- a/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild +++ b/libraries/libmusicbrainz5/libmusicbrainz5.SlackBuild @@ -70,6 +70,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch for the newer cmake +patch -p1 < $CWD/no_wildcards.patch + mkdir -p build ( cd build diff --git a/libraries/libmusicbrainz5/no_wildcards.patch b/libraries/libmusicbrainz5/no_wildcards.patch new file mode 100644 index 0000000000..b14d17e745 --- /dev/null +++ b/libraries/libmusicbrainz5/no_wildcards.patch @@ -0,0 +1,24 @@ +From 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd Mon Sep 17 00:00:00 2001 +From: Abderrahim Kitouni <a.kitouni@gmail.com> +Date: Fri, 13 Apr 2018 09:56:57 +0100 +Subject: [PATCH] src/CMakelists.txt: do not use wildcards for dependencies + +This is discouraged by cmake's documentation and doesn't work with the ninja generator. +--- + src/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 68c04e3..f7439d3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h +- DEPENDS make-c-interface cinterface.xml *.inc ++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc ++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc + ) + + ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h) |