From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Jun 2022 12:04:12 +0100
Subject: gentoo resync : 29.12.2022

---
 dev-java/jna/files/4.2.2-build.xml.patch       | 23 -----------------
 dev-java/jna/files/5.11.0-makefile-flags.patch | 34 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 23 deletions(-)
 delete mode 100644 dev-java/jna/files/4.2.2-build.xml.patch
 create mode 100644 dev-java/jna/files/5.11.0-makefile-flags.patch

(limited to 'dev-java/jna/files')

diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch
deleted file mode 100644
index de49c24b1912..000000000000
--- a/dev-java/jna/files/4.2.2-build.xml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/build.xml	2016-03-16 14:37:28.000000000 +0000
-+++ b/build.xml	2016-04-16 22:22:27.692967205 +0100
-@@ -320,7 +320,9 @@
-       <pathelement path="${build}/${jar}"/>
-       <pathelement path="${test.classes}"/>
-       <pathelement path="${build}/${testjar}"/>
-+      <!--
-       <pathelement path="lib/clover.jar"/>
-+      -->
-       <path refid="test.libs"/>
-     </path>
-   </target>
-@@ -909,8 +911,10 @@
-     <mkdir dir="${build}/jws"/>
-     <copy todir="${build}/jws" file="${build}/${jar}"/>
-     <copy todir="${build}/jws" file="${build}/${testjar}"/>
-+    <!--
-     <copy todir="${build}/jws" file="lib/junit.jar"/>
-     <copy todir="${build}/jws" file="lib/clover.jar"/>
-+    -->
-     <jar jarfile="${build}/jws/jnidispatch.jar">
-       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-     </jar>
diff --git a/dev-java/jna/files/5.11.0-makefile-flags.patch b/dev-java/jna/files/5.11.0-makefile-flags.patch
new file mode 100644
index 000000000000..4a84abebf45d
--- /dev/null
+++ b/dev-java/jna/files/5.11.0-makefile-flags.patch
@@ -0,0 +1,34 @@
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -81,7 +81,7 @@ LIBPFX=lib
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -94,10 +94,10 @@ CFLAGS_EXTRA=
+ COUT=-o $@
+ CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
+ CDEFINES=-D_REENTRANT
+-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
+-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
++PCFLAGS=-Wall -Wno-unused -Wno-parentheses
++CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
+        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
+-LDFLAGS=-o $@ -shared
++LDFLAGS+= -o $@ -shared
+ ifeq ($(DYNAMIC_LIBFFI),true)
+ CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
+ LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
+@@ -108,7 +108,7 @@ endif
+ # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
+ # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
+ #LIBS=-L"$(LIBDIR)" -ljawt
+-STRIP=strip -x
++STRIP?=strip -x
+ # end defaults
+ 
+ # Android build (cross-compile) requires the android NDK.
-- 
cgit v1.2.3