commit: 5c26e8b9cde6270ba8000c301872174601485416 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue May 31 06:57:51 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 31 23:44:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c26e8b9
dev-java/commons-daemon: do not call ar directly Closes: https://bugs.gentoo.org/848498 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/25700 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/commons-daemon/commons-daemon-1.3.1.ebuild | 6 ++++++ .../files/commons-daemon-1.3.1-Make.patch | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild index 7822d682f36a..f739750e8965 100644 --- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild +++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild @@ -28,6 +28,7 @@ RDEPEND=" >=virtual/jre-1.8:* " +PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" ) DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt ) HTML_DOCS=( PROPOSAL.html ) @@ -42,6 +43,11 @@ JAVA_SRC_DIR="src/main/java" # JAVA_TEST_GENTOO_CLASSPATH="junit-4" # JAVA_TEST_SRC_DIR="src/test/java" +src_prepare() { + default + java-pkg-2_src_prepare +} + src_compile() { java-pkg-simple_src_compile diff --git a/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch new file mode 100644 index 000000000000..001be15a2815 --- /dev/null +++ b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch @@ -0,0 +1,21 @@ +--- a/src/native/unix/Makedefs.in ++++ b/src/native/unix/Makedefs.in +@@ -17,6 +17,7 @@ + + # @author Pier Fumagalli <mailto:[email protected]> + ++AR = @AR@ + CC = @CC@ + CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ +--- a/src/native/unix/native/Makefile.in ++++ b/src/native/unix/native/Makefile.in +@@ -31,7 +31,7 @@ OBJS = arguments.o \ + all: jsvc libservice.a + + libservice.a: $(OBJS) +- ar cr libservice.a $(OBJS) ++ ${AR} cr libservice.a $(OBJS) + $(RANLIB) libservice.a + + jsvc: jsvc-unix.o libservice.a
