summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-12-04 23:09:50 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-12-04 23:19:01 +0100
commitb11ab4611f22b0e5454cadfcb3969adbf2248a85 (patch)
tree9bd27ddf5ceebc2fe5545de62f60fe660db1fd96 /media-sound/rosegarden/files
parentdev-python/brython: stable for amd64. (diff)
downloadgentoo-b11ab4611f22b0e5454cadfcb3969adbf2248a85.tar.gz
gentoo-b11ab4611f22b0e5454cadfcb3969adbf2248a85.tar.bz2
gentoo-b11ab4611f22b0e5454cadfcb3969adbf2248a85.zip
media-sound/rosegarden: Fix build w/ cmake-3.9.1
Closes: https://bugs.gentoo.org/625880 Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'media-sound/rosegarden/files')
-rw-r--r--media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
new file mode 100644
index 000000000000..bc587a729773
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
@@ -0,0 +1,18 @@
+Description: fix svnversion.h dependency to permit parallel building
+ With CMake 3.9.1 and parallel building enabled, the incorrect specification
+ of the output filename when creating svnversion.h can lead to a race condition
+ such that the package fails to build.
+Author: Stuart Prescott <stuart@debian.org>
+Bug: https://sourceforge.net/p/rosegarden/bugs/1552/
+Bug-Debian: https://bugs.debian.org/871213
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -810,7 +810,7 @@
+ add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string
+
+ # creates svnheader.h using cmake script
+-add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h
++add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+ COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake)
+