| 1 |
commit: 7d9069c315688f51766ccd232f8a79a216d44cc5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 22:34:31 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 23:04:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9069c3 |
| 7 |
|
| 8 |
games-strategy/0ad: update formatting for asset generation |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 11 ++++++++--- |
| 13 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild |
| 16 |
index cde93c077b3..d3e3cac5127 100644 |
| 17 |
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild |
| 18 |
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild |
| 19 |
@@ -164,6 +164,8 @@ src_compile() { |
| 20 |
|
| 21 |
# Merged from 0ad-data |
| 22 |
# bug #771147 (comment 3) |
| 23 |
+ # We're building the assets from source if we're not using a release |
| 24 |
+ # Warning: fragile |
| 25 |
if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then |
| 26 |
# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing. |
| 27 |
addpredict /proc/self/task |
| 28 |
@@ -174,13 +176,16 @@ src_compile() { |
| 29 |
mod_name="${archivebuild_input##*/}" |
| 30 |
archivebuild_output="archives/${mod_name}" |
| 31 |
|
| 32 |
- mkdir -p "${archivebuild_output}" |
| 33 |
+ mkdir -p "${archivebuild_output}" || die |
| 34 |
|
| 35 |
einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" |
| 36 |
- LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die |
| 37 |
+ LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \ |
| 38 |
+ -archivebuild="${archivebuild_input}" \ |
| 39 |
+ -archivebuild-output="${archivebuild_output}/${mod_name}.zip" \ |
| 40 |
+ || die "Failed to build assets" |
| 41 |
|
| 42 |
if [[ -f "${archivebuild_input}/mod.json" ]]; then |
| 43 |
- cp "${archivebuild_input}/mod.json" "${archivebuild_output}" |
| 44 |
+ cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die |
| 45 |
fi |
| 46 |
|
| 47 |
rm -r "${archivebuild_input}" || die |
Archives