commit: 1a5069b33787fa5114814d70535bab4775c74fb7 Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Fri Aug 5 16:03:20 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Aug 10 08:24:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5069b3
dev-java/java-service-wrapper: replace testsuite.patch with sed java-service-wrapper-3.5.25-testsuite.patch should have been ported to 3.5.50 but wasn't. Since it's a trivial patch, rather than rebasing it each time, just replace with a sed. Closes: https://bugs.gentoo.org/863761 Signed-off-by: matoro <matoro <AT> users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/26749 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild index 149e25fdc514..40ab4cf7bcbd 100644 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild @@ -47,7 +47,11 @@ src_prepare() { cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make" java-pkg-2_src_prepare - # enable tests on all platforms + # disable tests by default (they are only enabled by default on amd64) + sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \ + -i src/c/Makefile-linux-x86-64.make || die + + # re-enable tests on all platforms if requested if use test; then grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make assert
