File jna-build.patch of Package libjnidispatch

Overview Repositories Revisions Requests Users Attributes Meta

File jna-build.patch of Package libjnidispatch (Revision d45d3dee180ba79bd2ae84047b365b00)

Currently displaying revision d45d3dee180ba79bd2ae84047b365b00 , Show latest

--- jna-4.5.0/build.xml	2017-09-13 22:12:57.000000000 +0200
+++ jna-4.5.0/build.xml	2017-09-19 16:29:45.193799835 +0200
@@ -337,7 +337,7 @@
   <target name="-setup" depends="-dynamic-properties">
     <path id="compile-test.path">
       <path id="test.libs">
-        <fileset dir="lib">
+          <fileset dir="/usr/share/java">
           <include name="junit.jar"/>
           <include name="hamcrest-core-1.3.jar"/>
         </fileset>
@@ -382,7 +382,7 @@
       </srcfiles>
     </uptodate>
   </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
+  <target name="jar" depends="-setup,compile,:jar" unless="-jar"
           description="Build primary jar">
     
-        <attribute name="Bundle-NativeCode"
-                   value="
-com/sun/jna/win32-x86/jnidispatch.dll;
-processor=x86;osname=win32,
-com/sun/jna/win32-x86-64/jnidispatch.dll;
-processor=x86-64;osname=win32,
-com/sun/jna/win32-x86/jnidispatch.dll;
-processor=x86;osname=win,
-com/sun/jna/win32-x86-64/jnidispatch.dll;
-processor=x86-64;osname=win,
-com/sun/jna/w32ce-arm/jnidispatch.dll;
-processor=arm;osname=wince,
-
-com/sun/jna/sunos-x86/libjnidispatch.so;
-processor=x86;osname=sunos,
-com/sun/jna/sunos-x86-64/libjnidispatch.so;
-processor=x86-64;osname=sunos,
-com/sun/jna/sunos-sparc/libjnidispatch.so;
-processor=sparc;osname=sunos,
-com/sun/jna/sunos-sparcv9/libjnidispatch.so;
-processor=sparcv9;osname=sunos,
-
-com/sun/jna/aix-ppc/libjnidispatch.a;
-processor=ppc;osname=aix,
-com/sun/jna/aix-ppc64/libjnidispatch.a;
-processor=ppc64;osname=aix,
-
-com/sun/jna/linux-ppc/libjnidispatch.so;
-processor=ppc;osname=linux,
-com/sun/jna/linux-ppc64/libjnidispatch.so;
-processor=ppc64;osname=linux,
-com/sun/jna/linux-ppc64le/libjnidispatch.so;
-processor=ppc64le;osname=linux,
-com/sun/jna/linux-x86/libjnidispatch.so;
-processor=x86;osname=linux,
-com/sun/jna/linux-x86-64/libjnidispatch.so;
-processor=x86-64;osname=linux,
-com/sun/jna/linux-arm/libjnidispatch.so;
-processor=arm;osname=linux,
-com/sun/jna/linux-armel/libjnidispatch.so;
-processor=armel;osname=linux,
-com/sun/jna/linux-aarch64/libjnidispatch.so;
-processor=aarch64;osname=linux,
-com/sun/jna/linux-ia64/libjnidispatch.so;
-processor=ia64;osname=linux,
-com/sun/jna/linux-sparcv9/libjnidispatch.so;
-processor=sparcv9;osname=linux,
-com/sun/jna/linux-mips64el/libjnidispatch.so;
-processor=mips64el;osname=linux,
-com/sun/jna/linux-s390x/libjnidispatch.so;
-processor=S390x;osname=linux,
-
-com/sun/jna/freebsd-x86/libjnidispatch.so;
-processor=x86;osname=freebsd,
-com/sun/jna/freebsd-x86-64/libjnidispatch.so;
-processor=x86-64;osname=freebsd,
-com/sun/jna/openbsd-x86/libjnidispatch.so;
-processor=x86;osname=openbsd,
-com/sun/jna/openbsd-x86-64/libjnidispatch.so;
-processor=x86-64;osname=openbsd,
-
-com/sun/jna/darwin/libjnidispatch.jnilib;
-osname=macosx;processor=x86;processor=x86-64;processor=ppc
-"/>
       </manifest>
       <fileset dir="${classes}" excludes="${jar.omitted}">
         <patternset refid="jar-compiled"/>
       </fileset>
-      <zipfileset src="${lib.native}/win32-x86.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${lib.native}/aix-ppc.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/aix-ppc"/>
-      <zipfileset src="${lib.native}/aix-ppc64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/aix-ppc64"/>
-      <zipfileset src="${lib.native}/darwin.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${lib.native}/linux-x86.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-x86"/>
-      <zipfileset src="${lib.native}/linux-x86-64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-x86-64"/>
-      <zipfileset src="${lib.native}/linux-arm.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-arm"/>
-      <zipfileset src="${lib.native}/linux-armel.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-armel"/>
-      <zipfileset src="${lib.native}/linux-aarch64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-aarch64"/>
-      <zipfileset src="${lib.native}/linux-ia64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${lib.native}/linux-ppc.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ppc"/>
-      <zipfileset src="${lib.native}/linux-ppc64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ppc64"/>
-      <zipfileset src="${lib.native}/linux-ppc64le.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ppc64le"/>
-      <zipfileset src="${lib.native}/linux-sparcv9.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-sparcv9"/>
-      <zipfileset src="${lib.native}/linux-mips64el.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-mips64el"/>
-      <zipfileset src="${lib.native}/linux-s390x.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-s390x"/>
-      <zipfileset src="${lib.native}/sunos-x86.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${lib.native}/sunos-x86-64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86-64"/>
-      <zipfileset src="${lib.native}/sunos-sparc.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${lib.native}/sunos-sparcv9.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${lib.native}/freebsd-x86.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-x86"/>
-      <zipfileset src="${lib.native}/freebsd-x86-64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-x86-64"/>
-      <zipfileset src="${lib.native}/openbsd-x86.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-x86"/>
-      <zipfileset src="${lib.native}/openbsd-x86-64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-x86-64"/>
-      <zipfileset src="${lib.native}/win32-x86-64.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86-64"/>
-      <zipfileset src="${lib.native}/w32ce-arm.jar"
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/w32ce-arm"/>
     </jar>
     <zip zipfile="${build}/${minjar}">
       <zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
@@ -978,7 +836,7 @@
     </javac>
   </target>
 
-  <target name="compile-tests" depends="compile,native,jar"
+  <target name="compile-tests" depends="compile,jar"
   	description="Compile all test code">
     <javac classpathref="compile-test.path"
            source="${test.compatibility}"
@@ -1024,8 +882,6 @@
     <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>
@@ -1228,7 +1084,7 @@
     </jar>
   </target>
 
-  <target name="dist" depends="jar,aar,javadoc,contrib-jars,compile-tests,native"
+  <target name="dist" depends="jar,aar,javadoc,contrib-jars,compile-tests"
           description="Build distribution files">
     <copy todir="${dist}" force="true" overwrite="true">
       <fileset dir="${build}" includes="${jar},${minjar},${aar}"/>
--- jna-4.5.0/native/Makefile	2017-09-13 22:12:57.000000000 +0200
+++ jna-4.5.0/native/Makefile	2017-09-19 16:27:21.845797388 +0200
@@ -83,7 +83,7 @@
 JNISFX=$(LIBSFX)
 CC=gcc
 LD=$(CC)
-LIBS=
+LIBS=-ldl -lpthread
 # Default to Sun recommendations for JNI compilation
 COPT=-O2 -fno-omit-frame-pointer -fno-strict-aliasing
 CASM=-S
@@ -108,7 +108,7 @@
 # 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=@echo
 # end defaults
 
 # Android build (cross-compile) requires the android NDK.
Only in jna-4.5.0/native: Makefile.orig

Places

File jna-build.patch of Package libjnidispatch (Revision d45d3dee180ba79bd2ae84047b365b00)

Places