1 |
commit: 5c26e8b9cde6270ba8000c301872174601485416 |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Tue May 31 06:57:51 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 31 23:44:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c26e8b9 |
7 |
|
8 |
dev-java/commons-daemon: do not call ar directly |
9 |
|
10 |
Closes: https://bugs.gentoo.org/848498 |
11 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/25700 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-java/commons-daemon/commons-daemon-1.3.1.ebuild | 6 ++++++ |
16 |
.../files/commons-daemon-1.3.1-Make.patch | 21 +++++++++++++++++++++ |
17 |
2 files changed, 27 insertions(+) |
18 |
|
19 |
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild |
20 |
index 7822d682f36a..f739750e8965 100644 |
21 |
--- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild |
22 |
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild |
23 |
@@ -28,6 +28,7 @@ RDEPEND=" |
24 |
>=virtual/jre-1.8:* |
25 |
" |
26 |
|
27 |
+PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" ) |
28 |
DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt ) |
29 |
HTML_DOCS=( PROPOSAL.html ) |
30 |
|
31 |
@@ -42,6 +43,11 @@ JAVA_SRC_DIR="src/main/java" |
32 |
# JAVA_TEST_GENTOO_CLASSPATH="junit-4" |
33 |
# JAVA_TEST_SRC_DIR="src/test/java" |
34 |
|
35 |
+src_prepare() { |
36 |
+ default |
37 |
+ java-pkg-2_src_prepare |
38 |
+} |
39 |
+ |
40 |
src_compile() { |
41 |
java-pkg-simple_src_compile |
42 |
|
43 |
|
44 |
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 |
45 |
new file mode 100644 |
46 |
index 000000000000..001be15a2815 |
47 |
--- /dev/null |
48 |
+++ b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch |
49 |
@@ -0,0 +1,21 @@ |
50 |
+--- a/src/native/unix/Makedefs.in |
51 |
++++ b/src/native/unix/Makedefs.in |
52 |
+@@ -17,6 +17,7 @@ |
53 |
+ |
54 |
+ # @author Pier Fumagalli <mailto:pier.fumagalli@×××××××.com> |
55 |
+ |
56 |
++AR = @AR@ |
57 |
+ CC = @CC@ |
58 |
+ CFLAGS = @CFLAGS@ |
59 |
+ CPPFLAGS = @CPPFLAGS@ |
60 |
+--- a/src/native/unix/native/Makefile.in |
61 |
++++ b/src/native/unix/native/Makefile.in |
62 |
+@@ -31,7 +31,7 @@ OBJS = arguments.o \ |
63 |
+ all: jsvc libservice.a |
64 |
+ |
65 |
+ libservice.a: $(OBJS) |
66 |
+- ar cr libservice.a $(OBJS) |
67 |
++ ${AR} cr libservice.a $(OBJS) |
68 |
+ $(RANLIB) libservice.a |
69 |
+ |
70 |
+ jsvc: jsvc-unix.o libservice.a |