| 1 |
fordfrog 11/01/25 17:47:15 |
| 2 |
|
| 3 |
Added: 3.2.7-build.xml.patch 3.2.7-makefile-flags.patch |
| 4 |
Log: |
| 5 |
dev-java/jna: version bump |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-java/jna/files/3.2.7-build.xml.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.2.7-build.xml.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.2.7-build.xml.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 3.2.7-build.xml.patch |
| 16 |
=================================================================== |
| 17 |
--- build.xml.orig 2011-01-25 17:33:24.750473340 +0100 |
| 18 |
+++ build.xml 2011-01-25 17:07:14.657410373 +0100 |
| 19 |
@@ -176,7 +176,9 @@ |
| 20 |
<path id="test.runpath"> |
| 21 |
<pathelement path="${build}/${jar}"/> |
| 22 |
<pathelement path="${test.classes}"/> |
| 23 |
+ <!-- |
| 24 |
<pathelement path="lib/clover.jar"/> |
| 25 |
+ --> |
| 26 |
<path refid="test.libs"/> |
| 27 |
</path> |
| 28 |
</target> |
| 29 |
@@ -433,13 +435,17 @@ |
| 30 |
<copy todir="${build}/jws" file="${build}/${jar}"/> |
| 31 |
<copy todir="${build}/jws" file="${build}/${testjar}"/> |
| 32 |
<copy todir="${build}/jws" file="lib/junit.jar"/> |
| 33 |
+ <!-- |
| 34 |
<copy todir="${build}/jws" file="lib/clover.jar"/> |
| 35 |
+ --> |
| 36 |
<jar jarfile="${build}/jws/jnidispatch.jar"> |
| 37 |
<fileset dir="${build.native}" includes="*jnidispatch.*"/> |
| 38 |
</jar> |
| 39 |
+ <!-- |
| 40 |
<signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> |
| 41 |
- <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/> |
| 42 |
+ <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/> |
| 43 |
</signjar> |
| 44 |
+ --> |
| 45 |
</target> |
| 46 |
|
| 47 |
<!-- When running tests from an IDE, be sure to set jna.library.path --> |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 dev-java/jna/files/3.2.7-makefile-flags.patch |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.2.7-makefile-flags.patch?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.2.7-makefile-flags.patch?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: 3.2.7-makefile-flags.patch |
| 57 |
=================================================================== |
| 58 |
--- native/Makefile.orig 2011-01-25 16:42:02.341745978 +0100 |
| 59 |
+++ native/Makefile 2011-01-25 16:45:57.500174283 +0100 |
| 60 |
@@ -67,10 +66,10 @@ |
| 61 |
COUT=-o $@ |
| 62 |
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include |
| 63 |
CDEFINES=-D_REENTRANT |
| 64 |
-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses |
| 65 |
-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
| 66 |
+PCFLAGS=-Wall -Wno-unused -Wno-parentheses |
| 67 |
+CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ |
| 68 |
-DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' |
| 69 |
-LDFLAGS=-o $@ -shared |
| 70 |
+LDFLAGS+=-o $@ -shared |
| 71 |
ifeq ($(DYNAMIC_LIBFFI),true) |
| 72 |
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) |
| 73 |
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) |
| 74 |
@@ -109,7 +108,7 @@ |
| 75 |
ifneq ($(MINGW),) |
| 76 |
CC = $(MINGW) -m64 -mno-cygwin |
| 77 |
LD = $(CC) |
| 78 |
-LDFLAGS=-o $@ -shared |
| 79 |
+LDFLAGS+=-o $@ -shared |
| 80 |
LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt |
| 81 |
FFI_CONFIG += --host=x86_64-pc-mingw32 |
| 82 |
else |
| 83 |
@@ -129,14 +128,14 @@ |
| 84 |
ARCH=$(shell uname -m | sed 's/i.86/i386/g') |
| 85 |
PCFLAGS+=-fPIC |
| 86 |
CDEFINES+=-DHAVE_PROTECTION |
| 87 |
-LDFLAGS+=-Wl,-soname,$@ |
| 88 |
+LDFLAGS+= -Wl,-soname,$(shell basename $@) |
| 89 |
endif |
| 90 |
|
| 91 |
ifeq ($(OS),freebsd) |
| 92 |
ARCH=$(shell uname -m | sed 's/i.86/i386/g') |
| 93 |
PCFLAGS+=-fPIC |
| 94 |
CINCLUDES+=-I/usr/X11R6/include |
| 95 |
-LDFLAGS=-o $@ -shared |
| 96 |
+LDFLAGS+=-o $@ -shared |
| 97 |
CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT |
| 98 |
endif |
| 99 |
|
| 100 |
@@ -144,7 +143,7 @@ |
| 101 |
ARCH=$(shell uname -m | sed 's/i.86/i386/g') |
| 102 |
PCFLAGS+=-fPIC |
| 103 |
CINCLUDES+=-I/usr/X11R6/include |
| 104 |
-LDFLAGS=-o $@ -shared |
| 105 |
+LDFLAGS+= -o $@ -shared |
| 106 |
CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT |
| 107 |
endif |
| 108 |
|
| 109 |
@@ -191,7 +190,7 @@ |
| 110 |
endif |
| 111 |
PCFLAGS+=$(ISYSROOT) -x objective-c |
| 112 |
CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT |
| 113 |
-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ |
| 114 |
+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ |
| 115 |
-compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \ |
| 116 |
-current_version $(JNA_JNI_VERSION) \ |
| 117 |
-mmacosx-version-min=10.3 \ |
Archives