| 1 |
commit: 14be4a0ea20880015e350f99b0f0140a10877736 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Tue May 31 14:20:27 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 23:44:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14be4a0e |
| 7 |
|
| 8 |
dev-java/jna: do not call STRIP directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/754999 |
| 11 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/25702 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-java/jna/files/5.11.0-makefile-flags.patch | 34 ++++++++++++++++++++++++++ |
| 16 |
dev-java/jna/jna-5.11.0.ebuild | 4 +-- |
| 17 |
2 files changed, 36 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-java/jna/files/5.11.0-makefile-flags.patch b/dev-java/jna/files/5.11.0-makefile-flags.patch |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..4a84abebf45d |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-java/jna/files/5.11.0-makefile-flags.patch |
| 24 |
@@ -0,0 +1,34 @@ |
| 25 |
+--- a/native/Makefile |
| 26 |
++++ b/native/Makefile |
| 27 |
+@@ -81,7 +81,7 @@ LIBPFX=lib |
| 28 |
+ LIBSFX=.so |
| 29 |
+ ARSFX=.a |
| 30 |
+ JNISFX=$(LIBSFX) |
| 31 |
+-CC=gcc |
| 32 |
++CC?=gcc |
| 33 |
+ LD=$(CC) |
| 34 |
+ LIBS= |
| 35 |
+ # Default to Sun recommendations for JNI compilation |
| 36 |
+@@ -94,10 +94,10 @@ CFLAGS_EXTRA= |
| 37 |
+ COUT=-o $@ |
| 38 |
+ CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include |
| 39 |
+ CDEFINES=-D_REENTRANT |
| 40 |
+-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses |
| 41 |
+-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
| 42 |
++PCFLAGS=-Wall -Wno-unused -Wno-parentheses |
| 43 |
++CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
| 44 |
+ -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' |
| 45 |
+-LDFLAGS=-o $@ -shared |
| 46 |
++LDFLAGS+= -o $@ -shared |
| 47 |
+ ifeq ($(DYNAMIC_LIBFFI),true) |
| 48 |
+ CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) |
| 49 |
+ LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) |
| 50 |
+@@ -108,7 +108,7 @@ endif |
| 51 |
+ # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking |
| 52 |
+ # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705 |
| 53 |
+ #LIBS=-L"$(LIBDIR)" -ljawt |
| 54 |
+-STRIP=strip -x |
| 55 |
++STRIP?=strip -x |
| 56 |
+ # end defaults |
| 57 |
+ |
| 58 |
+ # Android build (cross-compile) requires the android NDK. |
| 59 |
|
| 60 |
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild |
| 61 |
index be8f367f117d..44173ced3c04 100644 |
| 62 |
--- a/dev-java/jna/jna-5.11.0.ebuild |
| 63 |
+++ b/dev-java/jna/jna-5.11.0.ebuild |
| 64 |
@@ -46,7 +46,7 @@ RDEPEND=" |
| 65 |
DOCS=( README.md CHANGES.md OTHERS TODO ) |
| 66 |
PATCHES=( |
| 67 |
"${FILESDIR}/5.10.0-build.xml.patch" |
| 68 |
- "${FILESDIR}/4.2.2-makefile-flags.patch" |
| 69 |
+ "${FILESDIR}/5.11.0-makefile-flags.patch" |
| 70 |
) |
| 71 |
|
| 72 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 73 |
@@ -65,7 +65,7 @@ pkg_setup() { |
| 74 |
# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS |
| 75 |
# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the |
| 76 |
# variable's value, so define them in ANT_OPTS instead |
| 77 |
- ANT_OPTS="-DCC='$(tc-getCC)'" |
| 78 |
+ ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'" |
| 79 |
# Parallel build does not respect dependency relationships between objects |
| 80 |
ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'" |
| 81 |
} |
Archives