friendly ping :)
Omar Polo <op@openbsd.org> wrote:
> Hello Jasper, ports@
>
> I wanted to update java/jna (to work with jdk-11) but that needs an
> updated libffi too.
>
> The development of libffi seems to have moved to github, at least for
> the release tarballs, and some patches were upstreamed.
>
> Regarding the shlib version: looking at check_sym it seems to warrant
> only a minor bump (5 symbols added) but upstream bumped the major 2
> years ago with this commit:
>
> https://github.com/libffi/libffi/commit/7855656148b96c7070ec362d2a73af840025a2b7
>
> the change to FFI_TRAMPOLINE_SIZE probably requires a major bump; I went
> with it to stay on the safe side.
>
> The list of consumer is daunting and I can't test everything nor run a
> bulk. So far I tested on amd64:
>
> - java/jna: (post update, see other thread) builds fine + all tests passing
> - lang/gforth: builds fine + all tests passing
> - lang/guile2: builds fine + and ffi tests are passing
> - lang/python/3.9: builds fine and the failing tests don't seem to be
> related to libffi
> - lang/ruby/3.1: like python-3.9
gnezdo@ tested also lang/ghc and devel/cabal-install on amd64 (thanks!)
> plus some testing with guile3 (not in ports yet.) I have the build and
> tests log for these I can share if needed.
>
> Comments and further testing (especially on !amd64) is appreciated :)
>
>
> The changelog is:
>
> Add static trampoline support for Linux on x86_64 and ARM64.
> Add support for Alibaba's CSKY architecture.
> Add support for Kalray's KVX architecture.
> Add support for Intel Control-flow Enforcement Technology (CET).
> Add support for ARM Pointer Authentication (PA).
> Fix 32-bit PPC regression.
> Fix MIPS soft-float problem.
> Enable tmpdir override with the $LIBFFI_TMPDIR environment variable.
> Enable compatibility with MSVC runtime stack checking.
> Reject float and small integer argument in ffi_prep_cif_var().
> Callers must promote these types themselves.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/libffi/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 11 Mar 2022 18:50:31 -0000 1.45
+++ Makefile 14 May 2022 09:09:29 -0000
@@ -1,8 +1,8 @@
COMMENT= Foreign Function Interface
-DISTNAME= libffi-3.3
-REVISION= 1
-SHARED_LIBS += ffi 1.2 # .6.4
+V= 3.4.2
+DISTNAME= libffi-$V
+SHARED_LIBS += ffi 2.0 # 9.0
CATEGORIES= devel
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -17,8 +17,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += c++abi
.endif
-MASTER_SITES= https://sourceware.org/pub/libffi/ \
- ftp://sourceware.org/pub/libffi/
+MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
DEBUG_PACKAGES = ${BUILD_PACKAGES}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/libffi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 10 Feb 2020 18:06:34 -0000 1.6
+++ distinfo 14 May 2022 10:01:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (libffi-3.3.tar.gz) = cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY=
-SIZE (libffi-3.3.tar.gz) = 1305466
+SHA256 (libffi-3.4.2.tar.gz) = VA+3IWGaaro73u99lA2Ong5tLBk1lbwkMkG3f/npNiA=
+SIZE (libffi-3.4.2.tar.gz) = 1351355
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/devel/libffi/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure
--- patches/patch-configure 11 Mar 2022 18:50:31 -0000 1.12
+++ patches/patch-configure 14 May 2022 09:06:48 -0000
@@ -3,7 +3,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -18475,6 +18475,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
+@@ -18650,6 +18650,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
fi
Index: patches/patch-configure_host
===================================================================
RCS file: /home/cvs/ports/devel/libffi/patches/patch-configure_host,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_host
--- patches/patch-configure_host 11 Mar 2022 18:50:31 -0000 1.2
+++ patches/patch-configure_host 14 May 2022 09:06:48 -0000
@@ -1,12 +1,12 @@
Index: configure.host
--- configure.host.orig
+++ configure.host
-@@ -203,7 +203,7 @@ case "${host}" in
+@@ -216,7 +216,7 @@ case "${host}" in
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- HAVE_LONG_DOUBLE_VARIANT=1
+ CFLAGS="$CFLAGS -D__NO_FPRS__"
;;
-- powerpc64-*-freebsd*)
-+ powerpc64-*-freebsd* | powerpc64-*-openbsd*)
+- powerpc64-*-freebsd* | powerpc64le-*-freebsd*)
++ powerpc64-*-freebsd* | powerpc64le-*-freebsd* | powerpc64-*-openbsd*)
TARGET=POWERPC; TARGETDIR=powerpc
;;
powerpc*-*-rtems*)
Index: patches/patch-src_arm_ffi_c
===================================================================
RCS file: /home/cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_arm_ffi_c
--- patches/patch-src_arm_ffi_c 11 Mar 2022 18:50:31 -0000 1.10
+++ patches/patch-src_arm_ffi_c 14 May 2022 09:06:48 -0000
@@ -3,8 +3,8 @@ https://svnweb.freebsd.org/ports/head/de
Index: src/arm/ffi.c
--- src/arm/ffi.c.orig
+++ src/arm/ffi.c
-@@ -55,6 +55,11 @@ extern unsigned int ffi_arm_trampoline[3] FFI_HIDDEN;
-
No comments:
Post a Comment