diff options
| author |   hasufell <julian.ospald@googlemail.com> | 2012-04-24 17:49:34 +0200 |
|---|---|---|
| committer | hasufell <julian.ospald@googlemail.com> | 2012-04-24 17:49:34 +0200 |
| commit | ee868ea5902e18769ba76410e056a95bda034bc2 (patch) | |
| tree | 7b80677cb368a28828861f904038947123c14a37 /games-strategy | |
| parent | games-strategy/0ad: fix test phase (was referring to non-existent useflag) (diff) | |
| download | sunrise-ee868ea5902e18769ba76410e056a95bda034bc2.tar.gz sunrise-ee868ea5902e18769ba76410e056a95bda034bc2.tar.bz2 sunrise-ee868ea5902e18769ba76410e056a95bda034bc2.zip | |
games-strategy/0ad: fix for test-phase when fam is disabled
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/0ad/0ad-11339_alpha9.ebuild | 4 | ||||
| -rw-r--r-- | games-strategy/0ad/ChangeLog | 4 | ||||
| -rw-r--r-- | games-strategy/0ad/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/0ad/files/11339_alpha9-test.patch | 46 |
4 files changed, 56 insertions, 3 deletions
diff --git a/games-strategy/0ad/0ad-11339_alpha9.ebuild b/games-strategy/0ad/0ad-11339_alpha9.ebuild index 121f5cd03..1f28eac19 100644 --- a/games-strategy/0ad/0ad-11339_alpha9.ebuild +++ b/games-strategy/0ad/0ad-11339_alpha9.ebuild @@ -47,7 +47,9 @@ S=${WORKDIR}/${MY_P} src_prepare() { # respect flags for 3rd party fcollada - epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch + # fix test-phase + epatch "${FILESDIR}"/11339_alpha9-fcollada-makefile.patch \ + "${FILESDIR}"/11339_alpha9-test.patch } src_configure() { diff --git a/games-strategy/0ad/ChangeLog b/games-strategy/0ad/ChangeLog index 0820af4a5..d83be1897 100644 --- a/games-strategy/0ad/ChangeLog +++ b/games-strategy/0ad/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Apr 2012; hasufell <julian.ospald@googlemail.com> + +files/11339_alpha9-test.patch, 0ad-11339_alpha9.ebuild: + fix for test-phase when fam is disabled + 24 Apr 2012; hasufell <julian.ospald@googlemail.com> 0ad-11339_alpha9.ebuild, 0ad-99999.ebuild: fix test phase (was referring to non-existent useflag) diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest index db0c057da..9a0a936a1 100644 --- a/games-strategy/0ad/Manifest +++ b/games-strategy/0ad/Manifest @@ -1,6 +1,7 @@ AUX 11339_alpha9-fcollada-makefile.patch 1069 RMD160 d9155d60bd47eb83876f3b65c92d6c2384f87bdc SHA1 a04d8aea0c8ea6e13d0c123c5590eaf3b45d10cf SHA256 11ed3a1d83c2784d590ec047750cd1cc56932ad2e10203f70f72d19fe879464f +AUX 11339_alpha9-test.patch 970 RMD160 88e2994e54aceecc25c0775d61daf90f02cf53fc SHA1 16c073d53a114d0d26e67feb04556b49b32b15dc SHA256 5439c079d32225c2f29ec73b920cb8294a9beffdf6edea41bc01a8a02c453f0b DIST 0ad-r11339-alpha-unix-build.tar.xz 8593664 RMD160 5e7fc6449f7bde30611880ac2575c7cd2ef021d2 SHA1 e44f8484ca7082b1a9f2761a48aa8f54c8e833d1 SHA256 1e69bc02c1af1bfbe30244467761d13e1aaff164fe583d962cc8e13faf4a56cb -EBUILD 0ad-11339_alpha9.ebuild 2286 RMD160 629b7a86753f49341af302ad3e07a687230313e4 SHA1 09755772ac2888cdfd529fe78963e326f3d001ef SHA256 9333e14eec56e23741077f73cf1ceca2bf6322efc0d66c4b4b15126c78b15336 +EBUILD 0ad-11339_alpha9.ebuild 2346 RMD160 1f05303c0ff37df803f083e4bb8a633cdf73fef7 SHA1 841847156b37509a730650b9d6f63bc4624600c9 SHA256 43cdab67606b312a20c5079775bc21aca40727ea75c6ae0ae551ed8f7118c754 EBUILD 0ad-99999.ebuild 2441 RMD160 ac59fb7dce211db179d6105fdbf1264d46112ce3 SHA1 a8d9c4f725d589721d806bd394ac2b94f0ac112e SHA256 d4c022e2923b239605fe98cdcb26de5ba5cea70dbdc9c247594fc41b2198f1fa -MISC ChangeLog 555 RMD160 72a4f21e5c88f855d391bc5e3780bf02a3da9b3d SHA1 42e6abe924b13ea80db392b71d6334120ef8adf2 SHA256 36be09059f1c7a434341a2545d5008b3f992ebdbe9aa01b2fd097a61bebfadcc +MISC ChangeLog 712 RMD160 e91f59f0a0ab680059ae1136cdaf2c00c7499831 SHA1 b0348527257bf5ca82d958b9723c49102bd47cea SHA256 6c7d9c0a01c382b58455a3bdba14426a58eb3eae74c754550b2d90dbff651753 MISC metadata.xml 340 RMD160 6ac942a82ac7f194dd3e3c6437c6870c7e54af18 SHA1 59ffafa67aee64665a8cb7404f26b694a8a9705a SHA256 79e3cad447e25c2749b646cf284cda9c44abb3865a89998a08f7e3df1561b73e diff --git a/games-strategy/0ad/files/11339_alpha9-test.patch b/games-strategy/0ad/files/11339_alpha9-test.patch new file mode 100644 index 000000000..82f737aa5 --- /dev/null +++ b/games-strategy/0ad/files/11339_alpha9-test.patch @@ -0,0 +1,46 @@ +upstream patch: http://trac.wildfiregames.com/changeset/11661 + +Build test executable with same linker settings as game executable, +to fix --without-fam + +--- build/premake/premake4.lua ++++ build/premake/premake4.lua +@@ -1167,13 +1167,20 @@ + + project_add_manifest() + +- elseif os.is("linux") or os.is ("bsd") then +- +- links { +- "fam", +- -- Utilities +- "rt", +- } ++ elseif os.is("linux") or os.is("bsd") then ++ ++ if not _OPTIONS["without-fam"] then ++ links { "fam" } ++ end ++ ++ if not _OPTIONS["android"] then ++ links { "rt" } ++ end ++ ++ if _OPTIONS["android"] then ++ -- NDK's STANDALONE-TOOLCHAIN.html says this is required ++ linkoptions { "-Wl,--fix-cortex-a8" } ++ end + + if os.is("linux") then + links { +@@ -1189,7 +1196,9 @@ + + -- Threading support + buildoptions { "-pthread" } +- linkoptions { "-pthread" } ++ if not _OPTIONS["android"] then ++ linkoptions { "-pthread" } ++ end + + -- For debug_resolve_symbol + configuration "Debug" |