You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.3 KiB
33 lines
1.3 KiB
Index: build.xml |
|
--- build.xml.orig 2019-10-30 19:26:04.146178000 +0100 |
|
+++ build.xml 2019-10-30 19:26:45.815281000 +0100 |
|
@@ -408,7 +408,7 @@ |
|
<!-- Bundle native components with primary jar to facilitate |
|
easy distribution to common platforms. |
|
--> |
|
- <jar jarfile="${build}/${jar}" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8"> |
|
+ <jar jarfile="${build}/${jar}" duplicate="add" update="true" createUnicodeExtraFields="never" encoding="UTF-8"> |
|
<manifest> |
|
<attribute name="Main-Class" value="com.sun.jna.Native"/> |
|
<attribute name="Manifest-Version" value="1.0"/> |
|
Index: native/Makefile |
|
--- native/Makefile.orig 2019-10-30 17:41:18.000000000 +0100 |
|
+++ native/Makefile 2019-10-30 19:26:04.146488000 +0100 |
|
@@ -81,7 +81,7 @@ |
|
LIBSFX=.so |
|
ARSFX=.a |
|
JNISFX=$(LIBSFX) |
|
-CC=gcc |
|
+CC=gcc -fPIC |
|
LD=$(CC) |
|
LIBS= |
|
# Default to Sun recommendations for JNI compilation |
|
@@ -93,7 +93,7 @@ |
|
CFLAGS_EXTRA= |
|
COUT=-o $@ |
|
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include |
|
-CDEFINES=-D_REENTRANT |
|
+CDEFINES=-D_REENTRANT -DNO_JAWT |
|
PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses |
|
CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
|
-DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
|
|
|