diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-11-01 23:36:28 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-11-01 23:36:28 +0000 |
| commit | 0c542a70b7eed9d8f8cc9caf034b3e547fd235bd (patch) | |
| tree | 465ca1f92ce2d4461312974156b14097b0d3b299 /games-strategy | |
| parent | stable new version, drop old (diff) | |
| download | gentoo-2-0c542a70b7eed9d8f8cc9caf034b3e547fd235bd.tar.gz gentoo-2-0c542a70b7eed9d8f8cc9caf034b3e547fd235bd.tar.bz2 gentoo-2-0c542a70b7eed9d8f8cc9caf034b3e547fd235bd.zip | |
add parallel-make patch from hasufell
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/hedgewars/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch | 24 | ||||
| -rw-r--r-- | games-strategy/hedgewars/hedgewars-0.9.18.ebuild | 8 |
3 files changed, 34 insertions, 4 deletions
diff --git a/games-strategy/hedgewars/ChangeLog b/games-strategy/hedgewars/ChangeLog index ade465aeeb7c..b5a2ff0ecdbc 100644 --- a/games-strategy/hedgewars/ChangeLog +++ b/games-strategy/hedgewars/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/hedgewars # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.41 2012/11/01 22:11:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.42 2012/11/01 23:36:28 mr_bones_ Exp $ + + 01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> + +files/hedgewars-0.9.18-cmake.patch, hedgewars-0.9.18.ebuild: + add parallel-make patch from hasufell 01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> hedgewars-0.9.18.ebuild: add ffmpeg dep diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch b/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch new file mode 100644 index 000000000000..61ff7dac2857 --- /dev/null +++ b/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch @@ -0,0 +1,24 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Nov 1 21:52:40 UTC 2012 +Subject: build system + +fix parallel make + +--- hedgewars/CMakeLists.txt ++++ hedgewars/CMakeLists.txt +@@ -193,7 +193,7 @@ + + #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6 + if(fpc_version LESS "020600") +- add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") ++ add_custom_target(ENGINECLEAN COMMAND $(MAKE) "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") + endif() + + +@@ -265,4 +265,6 @@ + add_dependencies(${engine_output_name} ENGINECLEAN) + endif() + ++add_dependencies(${engine_output_name} avwrapper) ++ + install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
\ No newline at end of file diff --git a/games-strategy/hedgewars/hedgewars-0.9.18.ebuild b/games-strategy/hedgewars/hedgewars-0.9.18.ebuild index 89d9a93e8c96..c57d5827bd65 100644 --- a/games-strategy/hedgewars/hedgewars-0.9.18.ebuild +++ b/games-strategy/hedgewars/hedgewars-0.9.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.18.ebuild,v 1.2 2012/11/01 22:11:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.18.ebuild,v 1.3 2012/11/01 23:36:28 mr_bones_ Exp $ EAPI=2 CMAKE_BUILD_TYPE=Release @@ -34,7 +34,9 @@ RDEPEND="${RDEPEND} S=${WORKDIR}/${PN}-src-${PV} src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch + epatch \ + "${FILESDIR}"/${P}-cflags.patch \ + "${FILESDIR}"/${P}-cmake.patch } src_configure() { @@ -48,7 +50,7 @@ src_configure() { } src_compile() { - cmake-utils_src_compile -j1 + cmake-utils_src_compile } src_install() { |