diff options
Diffstat (limited to 'dev-java/jna/files/5.10.0-build.xml.patch')
| -rw-r--r-- | dev-java/jna/files/5.10.0-build.xml.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch new file mode 100644 index 000000000000..242845bfd356 --- /dev/null +++ b/dev-java/jna/files/5.10.0-build.xml.patch @@ -0,0 +1,55 @@ +diff --git a/build.xml b/build.xml +index ed104c2..cd8895c 100644 +--- a/build.xml ++++ b/build.xml +@@ -182,9 +182,9 @@ + + <target name="-prepare-anttools"> + <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant> +- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" /> +- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" /> +- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" /> ++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" /> + </target> + + <target name="-dynamic-properties" depends="-prepare-anttools"> +@@ -385,7 +385,9 @@ + <pathelement path="${build}/${jar}"/> + <pathelement path="${test.classes}"/> + <pathelement path="${build}/${testjar}"/> ++ <!-- + <pathelement path="lib/clover.jar"/> ++ --> + <path refid="test.libs"/> + </path> + </target> +@@ -1265,8 +1267,10 @@ cd .. + <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" createUnicodeExtraFields="never" encoding="UTF-8"> + <fileset dir="${build.native}" includes="*jnidispatch.*"/> + </jar> +diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml +index 47fa8ed..a623ce6 100644 +--- a/contrib/platform/build.xml ++++ b/contrib/platform/build.xml +@@ -115,9 +115,9 @@ + + <target name="-prepare-anttools"> + <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant> +- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> +- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> +- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" /> ++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> ++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" /> + </target> + + <macrodef name="build-manifest"> |