diff options
| author |   William Breathitt Gray <vilhelm.gray@gmail.com> | 2020-05-01 14:11:10 -0400 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-04 22:07:22 +0200 |
| commit | 2e3353efaacf80e2ac04c3ef59bc91db4fe62937 (patch) | |
| tree | 5d8a93160aa3c6c9f0bd78f588915659b7b7039a /media-libs/musicbrainz | |
| parent | sci-electronics/klayout: stable for amd64 (diff) | |
| download | gentoo-2e3353efaacf80e2ac04c3ef59bc91db4fe62937.tar.gz gentoo-2e3353efaacf80e2ac04c3ef59bc91db4fe62937.tar.bz2 gentoo-2e3353efaacf80e2ac04c3ef59bc91db4fe62937.zip | |
media-libs/musicbrainz: Fix CMake error
This fixes a build error caused by improper use of wildcards in the
project's src/CMakelists.txt file.
Closes: https://bugs.gentoo.org/698090
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15600
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-libs/musicbrainz')
| -rw-r--r-- | media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch | 27 | ||||
| -rw-r--r-- | media-libs/musicbrainz/musicbrainz-5.1.0.ebuild | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch b/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch new file mode 100644 index 000000000000..d0bf0868d549 --- /dev/null +++ b/media-libs/musicbrainz/files/musicbrainz-5.1.0-no-wildcards.patch @@ -0,0 +1,27 @@ +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 2/2] 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) +-- +2.26.2 + diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild index 3c7debe14517..25b005bc1bdf 100644 --- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild +++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/lib${P}" +PATCHES=( "${FILESDIR}/${P}-no-wildcards.patch" ) + src_prepare() { use test || cmake_comment_add_subdirectory tests cmake-utils_src_prepare |