forked from pool/gluegen2
121 lines
8.1 KiB
Diff
121 lines
8.1 KiB
Diff
Index: gluegen-v2.3.2/make/build.xml
|
|
===================================================================
|
|
--- gluegen-v2.3.2.orig/make/build.xml
|
|
+++ gluegen-v2.3.2/make/build.xml
|
|
@@ -342,7 +342,13 @@
|
|
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
|
|
</target>
|
|
|
|
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.aarch64,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
|
|
+ <target name="declare.linux.riscv64" if="isLinuxRiscV64">
|
|
+ <echo message="Linux.riscv64" />
|
|
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
|
|
+ <property name="linker.cfg.id" value="linker.cfg.linux.riscv64" />
|
|
+ </target>
|
|
+
|
|
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.aarch64,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6,declare.linux.riscv64" if="isLinux" >
|
|
<property name="c.src.dir.os" value="unix" />
|
|
</target>
|
|
|
|
Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
|
===================================================================
|
|
--- gluegen-v2.3.2.orig/make/gluegen-cpptasks-base.xml
|
|
+++ gluegen-v2.3.2/make/gluegen-cpptasks-base.xml
|
|
@@ -54,6 +54,7 @@
|
|
- isLinuxs390
|
|
- isLinuxs390x
|
|
- isLinuxSparc
|
|
+ - isLinuxRiscV64
|
|
- isOSX
|
|
- isOSXPPC
|
|
- isSolaris
|
|
@@ -141,6 +142,7 @@
|
|
- compiler.cfg.linux.s390
|
|
- compiler.cfg.linux.s390x
|
|
- compiler.cfg.linux.sparc
|
|
+ - compiler.cfg.linux.riscv64
|
|
- compiler.cfg.solaris
|
|
- compiler.cfg.solaris.sparcv9
|
|
- compiler.cfg.solaris.amd64
|
|
@@ -163,6 +165,7 @@
|
|
- linker.cfg.linux.s390
|
|
- linker.cfg.linux.s390x
|
|
- linker.cfg.linux.sparc
|
|
+ - linker.cfg.linux.riscv64
|
|
- linker.cfg.freebsd.x86
|
|
- linker.cfg.freebsd.amd64
|
|
- linker.cfg.solaris
|
|
@@ -476,6 +479,15 @@
|
|
<condition property="sparc">
|
|
<os arch="sparc" />
|
|
</condition>
|
|
+ <condition property="isLinuxRiscV64">
|
|
+ <and>
|
|
+ <istrue value="${isLinux}" />
|
|
+ <os arch="riscv64" />
|
|
+ </and>
|
|
+ </condition>
|
|
+ <condition property="riscv64">
|
|
+ <os arch="riscv64" />
|
|
+ </condition>
|
|
|
|
<condition property="isLinuxX86">
|
|
<and>
|
|
@@ -639,6 +651,7 @@
|
|
<echo message="Linuxs390=${isLinuxs390}" />
|
|
<echo message="Linuxs390x=${isLinuxs390x}" />
|
|
<echo message="LinuxSparc=${isLinuxSparc}" />
|
|
+ <echo message="LinuxRiscV64=${isLinuxRiscV64}" />
|
|
<echo message="OS X=${isOSX}" />
|
|
<echo message="OS X PPC=${use.macosppc}" />
|
|
<echo message="OS X x32=${use.macosx32}" />
|
|
@@ -738,6 +751,10 @@
|
|
<property name="os.and.arch" value="linux-sparc" />
|
|
</target>
|
|
|
|
+ <target name="gluegen.cpptasks.detect.os.linux.riscv64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxRiscV64">
|
|
+ <property name="os.and.arch" value="linux-riscv64" />
|
|
+ </target>
|
|
+
|
|
<target name="gluegen.cpptasks.detect.os.android.armv6.armel" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv6Armel">
|
|
<property name="os.and.arch" value="android-armv6" />
|
|
</target>
|
|
@@ -750,7 +767,7 @@
|
|
<property name="os.and.arch" value="android-aarch64" />
|
|
</target>
|
|
|
|
- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
|
|
+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc,gluegen.cpptasks.detect.os.linux.riscv64" unless="gluegen.cpptasks.detected.os.2" />
|
|
|
|
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
|
|
<property name="native.library.suffix" value="*lib" />
|
|
@@ -1328,6 +1345,9 @@
|
|
<linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
|
|
</linker>
|
|
|
|
+ <linker id="linker.cfg.linux.riscv64" name="${gcc.compat.compiler}">
|
|
+ </linker>
|
|
+
|
|
<compiler id="linker.cfg.android" name="${gcc.compat.compiler}">
|
|
<!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
|
|
</compiler>
|
|
@@ -1625,7 +1645,17 @@
|
|
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
|
|
</target>
|
|
|
|
- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
|
|
+ <target name="gluegen.cpptasks.declare.compiler.linux.riscv64" if="isLinuxRiscV64">
|
|
+ <echo message="Linux.RiscV64" />
|
|
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
|
|
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
|
|
+ <condition property="java.lib.dir.platform" value="${java.home.dir}/lib">
|
|
+ <available file="${java.home.dir}/lib/libjawt.so"/>
|
|
+ </condition>
|
|
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/riscv64" />
|
|
+ </target>
|
|
+
|
|
+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc,gluegen.cpptasks.declare.compiler.linux.riscv64" if="isLinux">
|
|
<property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
|
|
</target>
|
|
|