forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
3 changed files
with
21 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 <[email protected]> | ||
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) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters