[gentoo-commits] gentoo-x86 commit in dev-java/jna/files: 3.3.0-build.xml.patch 3.3.0-makefile-flags.patch

[gentoo-commits] gentoo-x86 commit in dev-java/jna/files: 3.3.0-build.xml.patch 3.3.0-makefile-flags.patch

[Miroslav Sulc (fordfrog)]

fordfrog    11/12/13 17:05:49

  Added:                3.3.0-build.xml.patch 3.3.0-makefile-flags.patch
  Log:
  dev-java/jna: version bump
  
  (Portage version: 2.1.10.40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-java/jna/files/3.3.0-build.xml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.3.0-build.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.3.0-build.xml.patch?rev=1.1&content-type=text/plain

Index: 3.3.0-build.xml.patch
===================================================================
--- build.xml.orig	2011-01-25 17:33:24.750473340 +0100
+++ build.xml	2011-01-25 17:07:14.657410373 +0100
@@ -176,7 +176,9 @@
     <path id="test.runpath">
       <pathelement path="${build}/${jar}"/>
       <pathelement path="${test.classes}"/>
+      <!--
       <pathelement path="lib/clover.jar"/>
+      -->
       <path refid="test.libs"/>
     </path>
   </target>
@@ -433,13 +435,17 @@
     <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>
+    <!--
     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
+      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
     </signjar>
+    -->
   </target>
 	
   <!-- When running tests from an IDE, be sure to set jna.library.path -->



1.1                  dev-java/jna/files/3.3.0-makefile-flags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.3.0-makefile-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/files/3.3.0-makefile-flags.patch?rev=1.1&content-type=text/plain

Index: 3.3.0-makefile-flags.patch
===================================================================
--- native/Makefile.orig	2011-01-25 16:42:02.341745978 +0100
+++ native/Makefile	2011-01-25 16:45:57.500174283 +0100
@@ -67,10 +66,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)
@@ -109,7 +108,7 @@
 ifneq ($(MINGW),)
 CC = $(MINGW) -m64 -mno-cygwin
 LD = $(CC)
-LDFLAGS=-o $@ -shared
+LDFLAGS+=-o $@ -shared
 LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
 FFI_CONFIG += --host=x86_64-pc-mingw32
 else
@@ -129,14 +128,14 @@
 ARCH=$(shell uname -m | sed 's/i.86/i386/g')
 PCFLAGS+=-fPIC
 CDEFINES+=-DHAVE_PROTECTION
-LDFLAGS+=-Wl,-soname,$@
+LDFLAGS+= -Wl,-soname,$(shell basename $@)
 endif
 
 ifeq ($(OS),freebsd)
 ARCH=$(shell uname -m | sed 's/i.86/i386/g')
 PCFLAGS+=-fPIC
 CINCLUDES+=-I/usr/X11R6/include
-LDFLAGS=-o $@ -shared 
+LDFLAGS+=-o $@ -shared 
 CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
 endif
 
@@ -144,7 +143,7 @@
 ARCH=$(shell uname -m | sed 's/i.86/i386/g')
 PCFLAGS+=-fPIC
 CINCLUDES+=-I/usr/X11R6/include
-LDFLAGS=-o $@ -shared 
+LDFLAGS+= -o $@ -shared 
 CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
 endif
 
@@ -191,7 +190,7 @@
 endif
 PCFLAGS+=$(ISYSROOT) -x objective-c
 CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
   -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
   -current_version $(JNA_JNI_VERSION) \
   -mmacosx-version-min=10.3 \