Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.2:Update
libjnidispatch
jna-4.1.0-build.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File jna-4.1.0-build.patch of Package libjnidispatch
Index: jna-4.1.0/build.xml =================================================================== --- jna-4.1.0.orig/build.xml +++ jna-4.1.0/build.xml @@ -290,7 +290,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"/> </fileset> <fileset dir="lib/test"/> @@ -332,7 +332,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"> <!-- Bundle native components with primary jar to facilitate easy distribution to common platforms. @@ -364,118 +364,10 @@ <!-- Note that no terminal "*" is included in this list, which will force failure on unsupported platforms. --> - <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/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-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-ia64/libjnidispatch.so; -processor=ia64;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-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}/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*"/> @@ -782,7 +674,7 @@ osname=macosx;processor=x86;processor=x8 </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}" @@ -822,8 +714,6 @@ osname=macosx;processor=x86;processor=x8 <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> @@ -1011,7 +901,7 @@ osname=macosx;processor=x86;processor=x8 </jar> </target> - <target name="dist" depends="jar,javadoc,contrib-jars,compile-tests,native" + <target name="dist" depends="jar,javadoc,contrib-jars,compile-tests" description="Build distribution files"> <copy todir="${dist}"> <fileset dir="${build}" includes="${jar},${minjar}"/> Index: jna-4.1.0/native/Makefile =================================================================== --- jna-4.1.0.orig/native/Makefile +++ jna-4.1.0/native/Makefile @@ -80,7 +80,7 @@ ARSFX=.a 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 @@ -105,7 +105,7 @@ endif # 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 SDK+NDK.
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor