diff options
Diffstat (limited to 'dev-build/samurai')
| -rw-r--r-- | dev-build/samurai/Manifest | 5 | ||||
| -rw-r--r-- | dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch | 30 | ||||
| -rw-r--r-- | dev-build/samurai/metadata.xml | 6 | ||||
| -rw-r--r-- | dev-build/samurai/samurai-1.2-r3.ebuild (renamed from dev-build/samurai/samurai-1.2-r2.ebuild) | 1 |
4 files changed, 37 insertions, 5 deletions
diff --git a/dev-build/samurai/Manifest b/dev-build/samurai/Manifest index 1ed454c01d08..8bf9ca362220 100644 --- a/dev-build/samurai/Manifest +++ b/dev-build/samurai/Manifest @@ -1,5 +1,6 @@ AUX samurai-1.2-null_pointer_fix.patch 2089 BLAKE2B f721cec4d42b4826ec52d4e88ee86b907956739f30427eeaee047eef8e59f953c1bcb2fda301cf3a8214c707954cbbb0abf0901c63ec557f4d9cc614962894d1 SHA512 5ead4b0aa47fd9c3bc84cf437744a36a9a1ed21b438883d32ab98b598c98a20561ba46954255553befdb9f46efa4f6251f73342de9000415f09bce63064e52eb +AUX samurai-1.2-phony_targets_fix.patch 1010 BLAKE2B 5371e6ac3ea7f699627638f29e1fbb01f6670584d596c2cc82f15fde871b2e2f5386e1b2f13f9c17f135be71475921b6ff41a41dfe1104deb6f0e66f796ab429 SHA512 61ed28320ffa0bef6d48c1d8e3ebb4efb70326debf4b31bbc9fa5d3bb25319d03bd5bebec3e63d87f81ba03aaa05d9d57170af2ced0d6655e95f535c67b67401 DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225 -EBUILD samurai-1.2-r2.ebuild 749 BLAKE2B fd215292da69e3afa669e0c51925ea53bd71c81267bde9ac80bd6a55cda1296a3832eae7d59c47ab2ca7472dc7a38948e182abe5e701264bcf5b58a227842dff SHA512 c1d98d5832894a25929e52373dd4596256b283cbd597ea3515f6c4a00c8f17b1fee4e5235e968de122959ecbd63833664d7e89ecf6f08843d9420f048866cad9 +EBUILD samurai-1.2-r3.ebuild 793 BLAKE2B c2eb34fcd66ca3ec44b9d2d9f2ea4be87708403385c80f77d0c9dc0172cd864fd124ecbe80e60eb418b12a69ea427e3c55666cd17b3d3dc625d42cd95129f1c5 SHA512 12e08aefd90b1b3c0a702bd3729c7d734a3a9eac750f6dd6521a9c136d72b1386b055cfcad2a5726499f1843a3c984cbecf25089a57b97ac9604cc7799893a53 EBUILD samurai-9999.ebuild 667 BLAKE2B d7cd61d295ddd710163d362dd208643574b0784fd1ff77ab6010a72a2fc6ba6ddf9b0f8cc0bca94444899401e7c6c07ac377ebce22827787b5682011456b480e SHA512 dc94ed93d609f510f30d0b15d98fab58da752d08301527b239d693c003a33dae86cbbb45ac16b3b41192b259d3b5df9882001fc0371227dc5cd60d95bb4bd44b -MISC metadata.xml 454 BLAKE2B b3f71bd78021685a69254816df743ace390d3aadeaaf9adb1cdeb5f7c3f567623b863fe87b7b230e45efd65bb74b306e0615081f14d396882197c178eb2f77e7 SHA512 527fa97c53904b68ef8f182d6faf8c18116bf3b60099a1b0152a7326cbb372130bd2de0fda38c7ec66dac6d10dba9af29d50d1b98a12999108eab90cd5ed1b79 +MISC metadata.xml 471 BLAKE2B 1e6eb065b342b217a9713f9bad0d251db286179ed0abed65c96e492cb528eb60d99a67661b4f968902e862bd2089b011b8e7192195f16d535b104f1be2c2293e SHA512 4e8c8854a5afda6a5116caf62876c0b7f3eefde46c1abd102632aae425c9c44a15b7b50e8eda4f78b679ec291c201502c255150d5dee4fe58e2164b24b67ee2a diff --git a/dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch b/dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch new file mode 100644 index 000000000000..8794850a7285 --- /dev/null +++ b/dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch @@ -0,0 +1,30 @@ +https://github.com/michaelforney/samurai/issues/66 +https://github.com/michaelforney/samurai/issues/81 +https://github.com/michaelforney/samurai/commit/fb61f22c7e690715d309c41812412c4f432ef53a + +From fb61f22c7e690715d309c41812412c4f432ef53a Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Wed, 31 Mar 2021 14:04:29 -0700 +Subject: [PATCH] build: Don't try to print phony edges during dry-run + +This causes a segfault since phony edges have no command. It also +messes up the nstarted/nfinished counts. + +Fixes #66. +--- + build.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build.c b/build.c +index 368e5f9..1cb736f 100644 +--- a/build.c ++++ b/build.c +@@ -540,7 +540,7 @@ build(void) + while (work && numjobs < buildopts.maxjobs && numfail < buildopts.maxfail) { + e = work; + work = work->worknext; +- if (buildopts.dryrun) { ++ if (e->rule != &phonyrule && buildopts.dryrun) { + ++nstarted; + printstatus(e, edgevar(e, "command", true)); + ++nfinished; diff --git a/dev-build/samurai/metadata.xml b/dev-build/samurai/metadata.xml index f797645e008e..915803b8c390 100644 --- a/dev-build/samurai/metadata.xml +++ b/dev-build/samurai/metadata.xml @@ -5,9 +5,9 @@ <email>orbea@riseup.net</email> <name>orbea</name> </maintainer> - <maintainer type="person" proxied="proxy"> - <email>sam@gentoo.org</email> - <name>Sam James</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="github">michaelforney/samurai</remote-id> diff --git a/dev-build/samurai/samurai-1.2-r2.ebuild b/dev-build/samurai/samurai-1.2-r3.ebuild index d6584ed27041..4015659f2356 100644 --- a/dev-build/samurai/samurai-1.2-r2.ebuild +++ b/dev-build/samurai/samurai-1.2-r3.ebuild @@ -20,6 +20,7 @@ SLOT="0" PATCHES=( "${FILESDIR}/${P}-null_pointer_fix.patch" # 786951 + "${FILESDIR}/${P}-phony_targets_fix.patch" ) src_compile() { |