Hi.
This updates devel/libffi to the latest release.
I got an OK from jasper@ and it survived a bulk on amd64.
Testers on other arches welcomed.
Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libffi/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile 26 May 2022 07:24:38 -0000 1.46
+++ Makefile 4 Dec 2022 09:34:33 -0000
@@ -1,8 +1,8 @@
COMMENT= Foreign Function Interface
-V= 3.4.2
+V= 3.4.4
DISTNAME= libffi-$V
-SHARED_LIBS += ffi 2.0 # 9.0
+SHARED_LIBS += ffi 2.0 # 9.2
CATEGORIES= devel
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -17,14 +17,18 @@ PERMIT_PACKAGE= Yes
WANTLIB += c++abi
.endif
-MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
+MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
-DEBUG_PACKAGES = ${BUILD_PACKAGES}
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
+
+USE_GMAKE= Yes
TEST_DEPENDS= devel/dejagnu
CONFIGURE_STYLE= gnu
-FAKE_FLAGS+= includesdir="${PREFIX}/include"
+CONFIGURE_ARGS= --disable-multi-os-directory
+
+FAKE_FLAGS= includesdir="${PREFIX}/include"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libffi/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 26 May 2022 07:24:38 -0000 1.7
+++ distinfo 4 Dec 2022 09:34:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (libffi-3.4.2.tar.gz) = VA+3IWGaaro73u99lA2Ong5tLBk1lbwkMkG3f/npNiA=
-SIZE (libffi-3.4.2.tar.gz) = 1351355
+SHA256 (libffi-3.4.4.tar.gz) = 1mxWrSWags8qnfxAizK/XaUjcVALhHRff7i2RXEt9nY=
+SIZE (libffi-3.4.4.tar.gz) = 1362394
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/libffi/patches/patch-configure,v
retrieving revision 1.13
diff -u -p -r1.13 patch-configure
--- patches/patch-configure 26 May 2022 07:24:38 -0000 1.13
+++ patches/patch-configure 4 Dec 2022 09:34:33 -0000
@@ -1,18 +1,28 @@
+- Use our own libtool
- Link with libc++abi on arm (to access unwind symbols)
Index: configure
--- configure.orig
+++ configure
-@@ -18650,6 +18650,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
+@@ -9940,7 +9940,7 @@ esac
+ LIBTOOL_DEPS=$ltmain
- fi
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+@@ -19725,6 +19725,12 @@ if test "x$sys_symbol_underscore" = xyes; then
+ printf "%s\n" "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
+ fi
++
+case "$target" in
+ arm-*-openbsd*)
+ LDFLAGS="-lc++abi $LDFLAGS"
+ ;;
+esac
-+
+
FFI_EXEC_TRAMPOLINE_TABLE=0
case "$target" in
- *arm*-apple-* | aarch64-apple-*)
Index: patches/patch-configure_host
===================================================================
RCS file: /cvs/ports/devel/libffi/patches/patch-configure_host,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_host
--- patches/patch-configure_host 26 May 2022 07:24:38 -0000 1.3
+++ patches/patch-configure_host 4 Dec 2022 09:34:33 -0000
@@ -1,7 +1,7 @@
Index: configure.host
--- configure.host.orig
+++ configure.host
-@@ -216,7 +216,7 @@ case "${host}" in
+@@ -223,7 +223,7 @@ case "${host}" in
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
CFLAGS="$CFLAGS -D__NO_FPRS__"
;;
Index: patches/patch-src_arm_ffi_c
===================================================================
RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_arm_ffi_c
--- patches/patch-src_arm_ffi_c 26 May 2022 07:24:38 -0000 1.11
+++ patches/patch-src_arm_ffi_c 4 Dec 2022 09:34:33 -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
-@@ -64,6 +64,11 @@ extern unsigned char ffi_arm_trampoline[12] FFI_HIDDEN
- #include <machine/sysarch.h>
+@@ -68,6 +68,11 @@ extern unsigned char ffi_arm_trampoline[12] FFI_HIDDEN
+ #include <sys/mman.h>
No comments:
Post a Comment