Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jffi for openSUSE:Factory checked in at 2023-04-27 20:01:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jffi (Old) and /work/SRC/openSUSE:Factory/.jffi.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jffi" Thu Apr 27 20:01:16 2023 rev:5 rq:1083173 version:1.3.11 Changes: -------- --- /work/SRC/openSUSE:Factory/jffi/jffi.changes 2023-02-10 14:35:35.850019899 +0100 +++ /work/SRC/openSUSE:Factory/.jffi.new.1533/jffi.changes 2023-04-27 20:01:39.894183155 +0200 @@ -1,0 +2,12 @@ +Sun Apr 16 01:25:03 UTC 2023 - Anton Shvetz <[email protected]> + +- Update to v1.3.11 + * No changelog provided by upstream +- Update patches: + * jffi-add-built-jar-to-test-classpath.patch + * jffi-fix-dependencies-in-build-xml.patch + * jffi-fix-system-ffi.patch +- Remove "case FFI_BAD_ARGTYPE:" from jni/jffi/CallContext.c + conditionally when %{suse_version} <= 1500 + +------------------------------------------------------------------- @@ -4,0 +17 @@ + * No changelog provided by upstream @@ -9,0 +23 @@ + * No changelog provided by upstream @@ -23,0 +38 @@ + * No changelog provided by upstream Old: ---- jffi-1.3.10.tar.gz New: ---- jffi-1.3.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jffi.spec ++++++ --- /var/tmp/diff_new_pack.my8jqI/_old 2023-04-27 20:01:41.334191620 +0200 +++ /var/tmp/diff_new_pack.my8jqI/_new 2023-04-27 20:01:41.386191926 +0200 @@ -1,7 +1,7 @@ # # spec file for package jffi # -# 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 @@ -19,7 +19,7 @@ %global cluster jnr %global sover 1.2 Name: jffi -Version: 1.3.10 +Version: 1.3.11 Release: 0 Summary: Java Foreign Function Interface License: Apache-2.0 OR LGPL-3.0-or-later @@ -29,7 +29,7 @@ Source3: p2.inf Patch0: jffi-fix-dependencies-in-build-xml.patch Patch1: jffi-add-built-jar-to-test-classpath.patch -Patch4: jffi-fix-system-ffi.patch +Patch2: jffi-fix-system-ffi.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc @@ -64,11 +64,13 @@ %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -%patch1 -%patch4 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%if 0%{?suse_version} <= 1500 sed -i -e '/case FFI_BAD_ARGTYPE:/,3d' jni/jffi/CallContext.c +%endif # ppc{,64} fix # https://bugzilla.redhat.com/show_bug.cgi?id=561448#c9 ++++++ jffi-1.3.10.tar.gz -> jffi-1.3.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/.github/workflows/native-linux.yml new/jffi-jffi-1.3.11/.github/workflows/native-linux.yml --- old/jffi-jffi-1.3.10/.github/workflows/native-linux.yml 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/.github/workflows/native-linux.yml 2023-03-11 17:12:18.000000000 +0100 @@ -47,9 +47,9 @@ - name: Restart Docker run: sudo systemctl restart docker.service - name: Pull docker image - run: docker pull --platform $(echo ${{ matrix.arch }} | sed 's|-|/|g') debian:10 || true + run: docker pull --platform $(echo ${{ matrix.arch }} | sed 's|-|/|g') debian:8 || true - name: Build inside Docker - run: docker run --rm -v $GITHUB_WORKSPACE:/work debian:10 /work/.github/build-native-debian.sh + run: docker run --rm -v $GITHUB_WORKSPACE:/work debian:8 /work/.github/build-native-debian.sh - name: Archive built library uses: actions/upload-artifact@v2 with: Binary files old/jffi-jffi-1.3.10/archive/jffi-x86_64-Linux.jar and new/jffi-jffi-1.3.11/archive/jffi-x86_64-Linux.jar differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/build.xml new/jffi-jffi-1.3.11/build.xml --- old/jffi-jffi-1.3.10/build.xml 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/build.xml 2023-03-11 17:12:18.000000000 +0100 @@ -83,6 +83,11 @@ <os arch="loongarch64"/> </or> </condition> + <condition property="platform.cpu" value="mipsel"> + <or> + <os arch="mipsel"/> + </or> + </condition> <condition property="platform.cpu" value="mips64"> <or> <os arch="mips64"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/jni/GNUmakefile new/jffi-jffi-1.3.11/jni/GNUmakefile --- old/jffi-jffi-1.3.10/jni/GNUmakefile 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/jni/GNUmakefile 2023-03-11 17:12:18.000000000 +0100 @@ -22,7 +22,6 @@ endif CPU ?= $(shell uname -m | sed -e 's/i[345678]86/i386/') -MODEL = 32 # Default to 32bit compiles PLATFORM = $(CPU)-$(OS) JDK_HOME=$(shell if [ -d "$(JAVA_HOME)"/include ];then echo "$(JAVA_HOME)"; else echo "$(JAVA_HOME)"/..; fi) @@ -216,7 +215,6 @@ LIBFFI_LIBS ?= $(shell pkg-config --libs libffi) LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi) PLATFORM = aix - MODEL = 64 ARCHES = ppc64 WFLAGS += -Werror=undef endif @@ -237,22 +235,6 @@ endif endif -ifeq ($(CPU), sparcv9) - MODEL=64 -endif - -ifneq ($(findstring $(CPU), x86_64 amd64 ppc64 ppc64le powerpc64 s390x aarch64 loongarch64 mips64 mips64el),) - MODEL = 64 -endif - -# On platforms (linux, solaris) that support both 32bit and 64bit, force building for one or the other -ifneq ($(strip $(findstring $(OS), solaris)),) - # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags - # makes the libffi build choke - CC += -m$(MODEL) - LD += -m$(MODEL) -endif - LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT) LIBFFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \ @@ -278,7 +260,7 @@ @echo "OBJS=$(OBJS)" $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) - $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) + $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) $(STRIP) $@ ifeq ($(OS), darwin) codesign -s - $@ @@ -292,7 +274,7 @@ @mkdir -p $(@D) @$(CC) $(CFLAGS) -o $@ -c $< -$(OBJS) : $(LIBFFI) +$(OBJS) : $(LIBFFI_LIBS) ifeq ($(OS), darwin) build_ffi = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/jni/jffi/FastNumericInvoker.c new/jffi-jffi-1.3.11/jni/jffi/FastNumericInvoker.c --- old/jffi-jffi-1.3.10/jni/jffi/FastNumericInvoker.c 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/jni/jffi/FastNumericInvoker.c 2023-03-11 17:12:18.000000000 +0100 @@ -50,11 +50,7 @@ /* for return values <= sizeof(long), need to use an ffi_sarg sized return value */ -#if BYTE_ORDER == BIG_ENDIAN # define RETVAL(retval, ctx) ((ctx->cif.rtype)->size > sizeof(ffi_sarg) ? (retval).j : (retval).sarg) -#else -# define RETVAL(retval, ctx) ((retval).j) -#endif #define MAX_STACK_ARRAY (1024) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/jni/jffi/Foreign.c new/jffi-jffi-1.3.11/jni/jffi/Foreign.c --- old/jffi-jffi-1.3.10/jni/jffi/Foreign.c 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/jni/jffi/Foreign.c 2023-03-11 17:12:18.000000000 +0100 @@ -274,11 +274,14 @@ #elif defined(__ia64__) || defined(__ia64) # define CPU "ia64" -#elif defined(__mips__) || defined(__mips) || defined(__mips64) -# if defined (__mips64) +#elif defined(__mips64) +# if BYTE_ORDER == LITTLE_ENDIAN # define CPU "mips64el" -# else -# define CPU "mips" +# endif + +#elif defined (__mips__) || defined (__mips) +# if BYTE_ORDER == LITTLE_ENDIAN +# define CPU "mipsel" # endif #elif defined(__s390__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/libtest/GNUmakefile new/jffi-jffi-1.3.11/libtest/GNUmakefile --- old/jffi-jffi-1.3.10/libtest/GNUmakefile 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/libtest/GNUmakefile 2023-03-11 17:12:18.000000000 +0100 @@ -13,7 +13,6 @@ endif CPU = $(shell uname -m | sed -e 's/i[345678]86/i386/') -MODEL = 32 # Default to 32bit compiles PLATFORM = $(CPU)-$(OS) ifeq ($(OS), sunos) @@ -141,33 +140,6 @@ LIBEXT = dll PICFLAGS= endif -ifeq ($(CPU), sparcv9) - MODEL = 64 -endif - -ifeq ($(CPU), amd64) - MODEL = 64 -endif - -ifeq ($(CPU), x86_64) - MODEL = 64 -endif - -ifeq ($(CPU), s390x) - MODEL = 64 -endif - -ifeq ($(CPU), ppc64) - MODEL = 64 -endif - -# On platforms (linux, solaris) that support both 32bit and 64bit, force building for one or the other -ifneq ($(strip $(findstring $(OS), solaris)),) - # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags - # makes the libffi build choke - CC += -m$(MODEL) - LD += -m$(MODEL) -endif LIBTEST = $(BUILD_DIR)/$(LIBNAME) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/pom.xml new/jffi-jffi-1.3.11/pom.xml --- old/jffi-jffi-1.3.10/pom.xml 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/pom.xml 2023-03-11 17:12:18.000000000 +0100 @@ -8,7 +8,7 @@ <groupId>com.github.jnr</groupId> <artifactId>jffi</artifactId> <packaging>jar</packaging> - <version>1.3.10</version> + <version>1.3.11</version> <name>jffi</name> <description>Java Foreign Function Interface</description> <url>http://github.com/jnr/jffi</url> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/src/main/java/com/kenai/jffi/Platform.java new/jffi-jffi-1.3.11/src/main/java/com/kenai/jffi/Platform.java --- old/jffi-jffi-1.3.10/src/main/java/com/kenai/jffi/Platform.java 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/src/main/java/com/kenai/jffi/Platform.java 2023-03-11 17:12:18.000000000 +0100 @@ -106,8 +106,12 @@ AARCH64(64), /** LOONGARCH64 */ LOONGARCH64(64), - /** MIPS64EL */ + /** MIPSEL */ + MIPSEL(32), + /** MIPS64EL */ MIPS64EL(64), + /** RISCV64 */ + RISCV64(64), /** Unknown CPU */ UNKNOWN(64); @@ -248,8 +252,14 @@ } else if (Util.equalsIgnoreCase("loongarch64", archString, LOCALE)) { return CPU.LOONGARCH64; + } else if (Util.equalsIgnoreCase("mipsel", archString, LOCALE)) { + return CPU.MIPSEL; + } else if (Util.equalsIgnoreCase("mips64", archString, LOCALE) || Util.equalsIgnoreCase("mips64el", archString, LOCALE)) { return CPU.MIPS64EL; + + } else if (Util.equalsIgnoreCase("riscv64", archString, LOCALE)) { + return CPU.RISCV64; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/src/main/java/com/kenai/jffi/internal/StubLoader.java new/jffi-jffi-1.3.11/src/main/java/com/kenai/jffi/internal/StubLoader.java --- old/jffi-jffi-1.3.10/src/main/java/com/kenai/jffi/internal/StubLoader.java 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/src/main/java/com/kenai/jffi/internal/StubLoader.java 2023-03-11 17:12:18.000000000 +0100 @@ -161,8 +161,12 @@ AARCH64, /** LOONGARCH64 */ LOONGARCH64, + /** MIPS 32-bit little endian */ + MIPSEL, /** MIPS 64-bit little endian */ MIPS64EL, + /** RISC-V 64-bit little endian */ + RISCV64, /** Unknown CPU */ UNKNOWN; @@ -231,8 +235,12 @@ return CPU.AARCH64; } else if (Util.equalsIgnoreCase("loongarch64", archString, LOCALE)) { return CPU.LOONGARCH64; + } else if (Util.equalsIgnoreCase("mipsel", archString, LOCALE)) { + return CPU.MIPSEL; } else if (Util.equalsIgnoreCase("mips64", archString, LOCALE) || Util.equalsIgnoreCase("mips64el", archString, LOCALE)) { return CPU.MIPS64EL; + } else if (Util.equalsIgnoreCase("riscv64", archString, LOCALE)) { + return CPU.RISCV64; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jffi-jffi-1.3.10/src/test/java/com/kenai/jffi/NumberTest.java new/jffi-jffi-1.3.11/src/test/java/com/kenai/jffi/NumberTest.java --- old/jffi-jffi-1.3.10/src/test/java/com/kenai/jffi/NumberTest.java 2022-11-10 05:11:56.000000000 +0100 +++ new/jffi-jffi-1.3.11/src/test/java/com/kenai/jffi/NumberTest.java 2023-03-11 17:12:18.000000000 +0100 @@ -264,6 +264,9 @@ Assume.assumeFalse("Apple Silicon does not support 80-bit long double", Platform.getPlatform().getOS() == Platform.OS.DARWIN && Platform.getPlatform().getCPU() == Platform.CPU.AARCH64); + Assume.assumeFalse("32-bit ARM and MIPSel do not support 80-bit long double", + Platform.getPlatform().getCPU() == Platform.CPU.ARM || + Platform.getPlatform().getCPU() == Platform.CPU.MIPSEL); LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type); BigDecimal param = new BigDecimal("1.234567890123456789"); BigDecimal result = lib.ret_f128(param); ++++++ jffi-add-built-jar-to-test-classpath.patch ++++++ --- /var/tmp/diff_new_pack.my8jqI/_old 2023-04-27 20:01:42.594199028 +0200 +++ /var/tmp/diff_new_pack.my8jqI/_new 2023-04-27 20:01:42.626199215 +0200 @@ -1,13 +1,14 @@ ---- build.xml.sav 2015-04-30 18:23:37.609686947 +0300 -+++ build.xml 2015-04-30 18:23:50.621619907 +0300 -@@ -219,8 +219,8 @@ +diff -up jffi-jffi-1.3.11/build.xml.p01 jffi-jffi-1.3.11/build.xml +--- jffi-jffi-1.3.11/build.xml.p01 2023-03-11 19:12:18.000000000 +0300 ++++ jffi-jffi-1.3.11/build.xml 2023-04-16 05:00:58.276337651 +0300 +@@ -263,8 +263,8 @@ <javac srcdir="${src.test.dir}" destdir="${build.test.dir}/classes" includeantruntime="false" classpathref="classpath.test"> <classpath> <pathelement location="${build.classes.dir}"/> - <pathelement location="lib/junit_4/junit-4.11.jar"/> - <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/> + <pathelement location="lib/junit.jar"/> -+ <pathelement location="${complete.jar}"/> ++ <pathelement location="${complete.jar}"/> </classpath> </javac> </target> ++++++ jffi-fix-dependencies-in-build-xml.patch ++++++ --- /var/tmp/diff_new_pack.my8jqI/_old 2023-04-27 20:01:42.734199851 +0200 +++ /var/tmp/diff_new_pack.my8jqI/_new 2023-04-27 20:01:42.766200038 +0200 @@ -1,6 +1,7 @@ ---- build.xml.orig 2015-04-30 18:11:44.075363204 +0300 -+++ build.xml 2015-04-30 18:12:37.964085560 +0300 -@@ -172,8 +172,8 @@ +diff -up jffi-jffi-1.3.11/build.xml.p00 jffi-jffi-1.3.11/build.xml +--- jffi-jffi-1.3.11/build.xml.p00 2023-04-16 04:58:00.554135635 +0300 ++++ jffi-jffi-1.3.11/build.xml 2023-04-16 05:00:58.276337651 +0300 +@@ -178,8 +178,8 @@ <classpath> <pathelement location="${build.classes.dir}"/> <pathelement location="${build.test.dir}/classes"/> @@ -11,4 +12,15 @@ </classpath> <sysproperty key="java.library.path" value="${build.native.dir}"/> +@@ -241,8 +241,8 @@ + <classpath> + <pathelement location="${build.classes.dir}"/> + <pathelement location="${build.test.dir}/classes"/> +- <pathelement location="lib/junit_4/junit-4.11.jar"/> +- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/> ++ <pathelement location="lib/junit.jar"/> ++ <pathelement location="lib/hamcrest_core.jar"/> + </classpath> + <sysproperty key="java.library.path" value="${build.native.dir}"/> + <formatter type="plain" usefile="false"/> ++++++ jffi-fix-system-ffi.patch ++++++ --- /var/tmp/diff_new_pack.my8jqI/_old 2023-04-27 20:01:42.890200768 +0200 +++ /var/tmp/diff_new_pack.my8jqI/_new 2023-04-27 20:01:42.926200979 +0200 @@ -1,20 +1,20 @@ -diff -up jffi-jffi-1.3.9/jni/GNUmakefile.p04 jffi-jffi-1.3.9/jni/GNUmakefile ---- jffi-jffi-1.3.9/jni/GNUmakefile.p04 2022-05-11 12:10:48.933683705 +0300 -+++ jffi-jffi-1.3.9/jni/GNUmakefile 2022-05-11 12:12:26.005900040 +0300 -@@ -277,7 +277,7 @@ debug: +diff -up jffi-jffi-1.3.11/jni/GNUmakefile.p02 jffi-jffi-1.3.11/jni/GNUmakefile +--- jffi-jffi-1.3.11/jni/GNUmakefile.p02 2023-04-16 05:09:12.554497667 +0300 ++++ jffi-jffi-1.3.11/jni/GNUmakefile 2023-04-16 05:14:58.562823374 +0300 +@@ -259,7 +259,7 @@ debug: @echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)" @echo "OBJS=$(OBJS)" -$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) +$(LIBJFFI): $(OBJS) - $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) + $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) $(STRIP) $@ ifeq ($(OS), darwin) -@@ -292,7 +292,9 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wild +@@ -274,7 +274,9 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wild @mkdir -p $(@D) @$(CC) $(CFLAGS) -o $@ -c $< --$(OBJS) : $(LIBFFI) +-$(OBJS) : $(LIBFFI_LIBS) +ifneq ($(USE_SYSTEM_LIBFFI),1) +$(OBJS) : $(LIBFFI) +endif
