diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-java/jna/files | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-java/jna/files')
| -rw-r--r-- | dev-java/jna/files/4.2.2-build.xml.patch | 23 | ||||
| -rw-r--r-- | dev-java/jna/files/4.2.2-makefile-flags.patch | 25 |
2 files changed, 48 insertions, 0 deletions
diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch new file mode 100644 index 000000000000..de49c24b1912 --- /dev/null +++ b/dev-java/jna/files/4.2.2-build.xml.patch @@ -0,0 +1,23 @@ +--- 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/4.2.2-makefile-flags.patch b/dev-java/jna/files/4.2.2-makefile-flags.patch new file mode 100644 index 000000000000..3e290ece4e78 --- /dev/null +++ b/dev-java/jna/files/4.2.2-makefile-flags.patch @@ -0,0 +1,25 @@ +--- a/native/Makefile 2016-03-16 14:37:28.000000000 +0000 ++++ b/native/Makefile 2016-04-16 22:27:06.426345376 +0100 +@@ -81,7 +81,7 @@ + LIBSFX=.so + ARSFX=.a + JNISFX=$(LIBSFX) +-CC=gcc ++CC?=gcc + LD=$(CC) + LIBS= + # Default to Sun recommendations for JNI compilation +@@ -94,10 +94,10 @@ + 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) |