Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gluegen2 for openSUSE:Factory checked in at 2023-09-28 00:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gluegen2 (Old) and /work/SRC/openSUSE:Factory/.gluegen2.new.23327 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gluegen2" Thu Sep 28 00:25:43 2023 rev:16 rq:1113818 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gluegen2/gluegen2.changes 2022-02-07 23:39:45.569759213 +0100 +++ /work/SRC/openSUSE:Factory/.gluegen2.new.23327/gluegen2.changes 2023-09-28 00:34:03.695225038 +0200 @@ -1,0 +2,19 @@ +Wed Sep 27 08:01:16 UTC 2023 - Fridrich Strba <[email protected]> + +- Remove dependency on findbugs +- Modified patches: + * gluegen2-jdk9.patch + * gluegen2-riscv64.patch + + rediff to changed context + * gluegen2-jar-paths.patch + -> gluegen2-0005-use-system-antlib.patch + * gluegen2-add-ppc64-aarch64.patch + -> gluegen2-0007-add-ppc64-aarch64.patch + * gluegen2-no-static-libstdc++.patch + -> gluegen2-0006-disable-static-libgcc.patch + + rediff and rename +- Added patch: + * gluegen2-0008-jcpp-remove-javax-api.patch + + remove code quality annotations not necessary for our build + +------------------------------------------------------------------- Old: ---- gluegen2-add-ppc64-aarch64.patch gluegen2-jar-paths.patch gluegen2-no-static-libstdc++.patch New: ---- gluegen2-0005-use-system-antlib.patch gluegen2-0006-disable-static-libgcc.patch gluegen2-0007-add-ppc64-aarch64.patch gluegen2-0008-jcpp-remove-javax-api.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gluegen2.spec ++++++ --- /var/tmp/diff_new_pack.8yruhX/_old 2023-09-28 00:34:05.855303007 +0200 +++ /var/tmp/diff_new_pack.8yruhX/_new 2023-09-28 00:34:05.855303007 +0200 @@ -1,7 +1,7 @@ # # spec file for package gluegen2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,19 +26,17 @@ Summary: Tool for automatic generation the Java and JNI code License: BSD-2-Clause Group: Development/Libraries/Java -URL: http://jogamp.org/gluegen/www/ +URL: https://jogamp.org/gluegen/www/ Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.xz Source1: http://jogamp.org/deployment/v%{version}/archive/Sources/%{jcppsrc_name}.tar.xz -Patch0: gluegen2-jar-paths.patch -Patch1: gluegen2-0001-renamed-library.patch -Patch2: gluegen2-0003-disable-executable-tmp-tests.patch -Patch3: gluegen2-0004-add-antlr-jar-to-all-targets.patch -# FIXME: Disable all junit tests because it requires packages not yet packaged in obs -# PATCH-FIX-OPENSUSE gluegen2-disable-tests.patch [email protected] -- Remove junit tests from the "all" targets as this requires additional dependencies (jardiff) -Patch5: gluegen2-disable-tests.patch -Patch6: gluegen2-add-ppc64-aarch64.patch -# PATCH-FIX-UPSTREAM gluegen2-no-static-libstdc++.patch [email protected] -- Do not use -static-libstdc++ option for linker, causes build failures -Patch7: gluegen2-no-static-libstdc++.patch +Patch0: gluegen2-0001-renamed-library.patch +Patch1: gluegen2-0003-disable-executable-tmp-tests.patch +Patch2: gluegen2-0004-add-antlr-jar-to-all-targets.patch +Patch3: gluegen2-0005-use-system-antlib.patch +Patch4: gluegen2-0006-disable-static-libgcc.patch +Patch5: gluegen2-0007-add-ppc64-aarch64.patch +Patch6: gluegen2-0008-jcpp-remove-javax-api.patch +Patch7: gluegen2-disable-tests.patch Patch8: gluegen2-0001-Remove-version-overrides-for-memcpy.patch Patch9: gluegen2-jdk9.patch Patch10: gluegen2-jdk10.patch @@ -46,7 +44,6 @@ BuildRequires: ant >= 1.9.8 BuildRequires: ant-antlr BuildRequires: ant-contrib -BuildRequires: ant-findbugs BuildRequires: ant-junit BuildRequires: cpptasks BuildRequires: java-devel >= 1.8 @@ -88,6 +85,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -140,8 +138,12 @@ %build cd make ant -Djava.version=1.8 -Dant.java.version=1.8 \ - -Djavacdebug=true \ + -Djavacdebug=false \ -Djavacdebuglevel=lines,vars,source \ + -Dantlr.jar=$(find-jar antlr) \ + -Djunit.jar=$(find-jar junit) \ + -Dant.jar=$(find-jar ant) \ + -Dant-junit.jar=$(find-jar ant/ant-junit) \ -Dc.compiler.debug=true \ all @@ -167,13 +169,13 @@ chmod -x %{buildroot}%{_datadir}/%{name}/make/gluegen.properties %files -%doc LICENSE.txt +%license LICENSE.txt %{_javadir}/%{name}-rt.jar %{_jnidir}/%{name}-rt-natives.jar %{_libdir}/lib%{name}-rt.so %files devel -%doc LICENSE.txt +%license LICENSE.txt %{_javadir}/%{name}.jar %{gluegen_devel_dir}/ ++++++ gluegen2-0005-use-system-antlib.patch ++++++ --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="jogamp-androidtasks" basedir="."> <dirname property="jogamp-androidtasks.basedir" file="${ant.file.jogamp-androidtasks}"/> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${jogamp-androidtasks.basedir}/lib/ant-contrib-1.0b3.jar"/> - </classpath> - </taskdef> + <taskdef resource="net/sf/antcontrib/antlib.xml" /> <target name="test.regexp1" > <property name="jarbasename" value="gluegen-rt-android" /> --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -20,7 +20,7 @@ <!-- import cpptasks --> <!--typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/--> - <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/> + <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" /> <!-- 0 fetch environment variable GLUEGEN_CPPTASKS_FILE -> gluegen-cpptasks.file --> <property environment="env" /> --- a/make/jogamp-archivetasks.xml +++ b/make/jogamp-archivetasks.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="jogamp-archivetasks" basedir="."> <dirname property="jogamp-archivetasks.basedir" file="${ant.file.jogamp-archivetasks}"/> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${jogamp-archivetasks.basedir}/lib/ant-contrib-1.0b3.jar"/> - </classpath> - </taskdef> + <taskdef resource="net/sf/antcontrib/antlib.xml" /> <macrodef name="archive.7z"> <attribute name="basedir" /> ++++++ gluegen2-0006-disable-static-libgcc.patch ++++++ --- a/make/stub_includes/platform/glibc-compat-symbols.h +++ b/make/stub_includes/platform/glibc-compat-symbols.h @@ -45,6 +45,8 @@ #define GLIBC_COMPAT_SYMBOL(FFF) #endif +#undef GLIBC_COMPAT_SYMBOL +#define GLIBC_COMPAT_SYMBOL(FFF) GLIBC_COMPAT_SYMBOL(memcpy) #endif /*__GLIBC_COMPAT_SYMBOLS_H__*/ --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1217,20 +1217,14 @@ <!-- Unix linker configuration --> <linker id="linker.cfg.linux" name="${gcc.compat.compiler}"> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <!-- Using default compiler settings - utilize: @@ -1241,16 +1235,12 @@ <linkerarg value="-fpic" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}"> - <linkerarg value="-fpic" /> + <linkerarg value="-fpic" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}"> @@ -1296,20 +1286,14 @@ <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}"> <linkerarg value="-xarch=v9a" /> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- linkerarg value="-xarch=amd64" / --> </linker> @@ -1324,8 +1308,6 @@ <linkerarg value="-arch" if="use.macosx64"/> <linkerarg value="x86_64" if="use.macosx64"/> <linkerarg value="-mmacosx-version-min=10.5"/> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard --> </linker> @@ -1334,16 +1316,12 @@ <!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"--> <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker"> <linkerarg value="-m64"/> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"--> <linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker"> <linkerarg value="-m32"/> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false"> @@ -1351,8 +1329,6 @@ <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false"> @@ -1360,8 +1336,6 @@ <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.win32.msvc" name="msvc" incremental="false"> --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -110,8 +110,6 @@ <linkerarg value="--demangle" /> <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> - <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told where to find libgcc as the default location (gcc -print-search-dirs) is not correct. Not sure if this is a bug in the NDK or not. We also ++++++ gluegen2-0007-add-ppc64-aarch64.patch ++++++ Index: gluegen-v2.3.2/make/build.xml =================================================================== --- gluegen-v2.3.2.orig/make/build.xml +++ gluegen-v2.3.2/make/build.xml @@ -264,6 +264,12 @@ <property name="linker.cfg.id" value="linker.cfg.linux.amd64" /> </target> + <target name="declare.linux.aarch64" if="isLinuxARM64"> + <echo message="Linux.AArch64" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.aarch64" /> + <property name="linker.cfg.id" value="linker.cfg.linux.aarch64" /> + </target> + <target name="declare.linux.ia64" if="isLinuxIA64"> <echo message="Linux.IA64" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -306,6 +312,18 @@ <property name="linker.cfg.id" value="linker.cfg.linux.ppc" /> </target> + <target name="declare.linux.ppc64" if="isLinuxPpc64"> + <echo message="Linux.ppc64" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <property name="linker.cfg.id" value="linker.cfg.linux.ppc64" /> + </target> + + <target name="declare.linux.ppc64le" if="isLinuxPpc64le"> + <echo message="Linux.ppc64le" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" /> + </target> + <target name="declare.linux.s390" if="isLinuxs390"> <echo message="Linux.s390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -324,7 +342,7 @@ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" > + <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" > <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 @@ -48,6 +48,8 @@ - isLinuxMips - isLinuxMipsel - isLinuxPpc + - isLinuxPpc64 + - isLinuxPpc64le - isLinuxs390 - isLinuxs390x - isLinuxSparc @@ -133,6 +135,8 @@ - compiler.cfg.linux.mips - compiler.cfg.linux.mipsel - compiler.cfg.linux.ppc + - compiler.cfg.linux.ppc64 + - compiler.cfg.linux.ppc64le - compiler.cfg.linux.s390 - compiler.cfg.linux.s390x - compiler.cfg.linux.sparc @@ -417,6 +421,24 @@ <condition property="ppc"> <os arch="ppc" /> </condition> + <condition property="isLinuxPpc64"> + <and> + <istrue value="${isLinux}" /> + <os arch="ppc64" /> + </and> + </condition> + <condition property="ppc64"> + <os arch="ppc64" /> + </condition> + <condition property="isLinuxPpc64le"> + <and> + <istrue value="${isLinux}" /> + <os arch="ppc64le" /> + </and> + </condition> + <condition property="ppc64le"> + <os arch="ppc64le" /> + </condition> <condition property="isLinuxs390"> <and> <istrue value="${isLinux}" /> @@ -457,6 +479,9 @@ <istrue value="${isAMD64}" /> </and> </condition> + <condition property="isAArch64"> + <os arch="aarch64" /> + </condition> <condition property="isLinuxIA64"> <and> <istrue value="${isLinux}" /> @@ -601,6 +626,8 @@ <echo message="LinuxMips=${isLinuxMips}" /> <echo message="LinuxMipsel=${isLinuxMipsel}" /> <echo message="LinuxPpc=${isLinuxPpc}" /> + <echo message="LinuxPpc64=${isLinuxPpc64}" /> + <echo message="LinuxPpc64le=${isLinuxPpc64le}" /> <echo message="Linuxs390=${isLinuxs390}" /> <echo message="Linuxs390x=${isLinuxs390x}" /> <echo message="LinuxSparc=${isLinuxSparc}" /> @@ -683,6 +710,14 @@ <property name="os.and.arch" value="linux-ppc" /> </target> + <target name="gluegen.cpptasks.detect.os.linux.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64"> + <property name="os.and.arch" value="linux-ppc64" /> + </target> + + <target name="gluegen.cpptasks.detect.os.linux.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64le"> + <property name="os.and.arch" value="linux-ppc64le" /> + </target> + <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390"> <property name="os.and.arch" value="linux-s390" /> </target> @@ -707,7 +742,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.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,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.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" 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" /> @@ -1258,6 +1293,12 @@ <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}"> </linker> + <linker id="linker.cfg.linux.ppc64" name="${gcc.compat.compiler}"> + </linker> + + <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}"> + </linker> + <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}"> </linker> @@ -1441,7 +1482,7 @@ <echo message="Linux.aarch64" /> <property name="compiler.cfg.id.base" value="compiler.cfg.linux.aarch64" /> <property name="linker.cfg.id.base" value="linker.cfg.linux.aarch64" /> - <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/arm" /> + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" /> </target> <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64"> @@ -1479,6 +1520,20 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" /> </target> + <target name="gluegen.cpptasks.declare.compiler.linux.ppc64" if="isLinuxPpc64"> + <echo message="Linux.Ppc64" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.linux" /> + <property name="linker.cfg.id.base" value="linker.cfg.linux" /> + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" /> + </target> + + <target name="gluegen.cpptasks.declare.compiler.linux.ppc64le" if="isLinuxPpc64le"> + <echo message="Linux.Ppc64le" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.linux" /> + <property name="linker.cfg.id.base" value="linker.cfg.linux" /> + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" /> + </target> + <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390"> <echo message="Linux.s390" /> <property name="compiler.cfg.id.base" value="compiler.cfg.linux" /> @@ -1500,7 +1555,7 @@ <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.aarch64,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.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux"> + <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"> <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target> ++++++ gluegen2-0008-jcpp-remove-javax-api.patch ++++++ ++++ 1263 lines (skipped) ++++++ gluegen2-jdk9.patch ++++++ --- /var/tmp/diff_new_pack.8yruhX/_old 2023-09-28 00:34:05.931305751 +0200 +++ /var/tmp/diff_new_pack.8yruhX/_new 2023-09-28 00:34:05.931305751 +0200 @@ -118,7 +118,7 @@ + <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/arm" /> + <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" /> </target> @@ -1513,6 +1532,9 @@ ++++++ gluegen2-riscv64.patch ++++++ --- /var/tmp/diff_new_pack.8yruhX/_old 2023-09-28 00:34:05.943306184 +0200 +++ /var/tmp/diff_new_pack.8yruhX/_new 2023-09-28 00:34:05.947306328 +0200 @@ -6,14 +6,14 @@ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> </target> -- <target name="declare.linux" depends="declare.linux.x86,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.aarch64" if="isLinux" > +- <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.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.aarch64,declare.linux.riscv64" if="isLinux" > ++ <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> @@ -84,8 +84,8 @@ <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.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,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.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.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,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.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.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" /> @@ -103,7 +103,7 @@ <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.aarch64,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.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux"> +- <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" /> @@ -114,7 +114,7 @@ + <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.aarch64,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.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc,gluegen.cpptasks.declare.compiler.linux.riscv64" if="isLinux"> ++ <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>
