diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile index a92339dc782d..64fd0f7e6929 100644 --- a/devel/libffi/Makefile +++ b/devel/libffi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2021/12/08 22:28:36 tnn Exp $ +# $NetBSD: Makefile,v 1.48 2022/01/09 20:07:00 tm Exp $ DISTNAME= libffi-3.4.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=libffi/} GITHUB_RELEASE= v${PKGVERSION_NOREV} diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index d3cfc108f02d..8dcfcef7e066 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.60 2021/12/08 22:28:36 tnn Exp $ +$NetBSD: distinfo,v 1.61 2022/01/09 20:07:00 tm Exp $ BLAKE2s (libffi-3.4.2.tar.gz) = a5773b741a815ea113d4b8e2ec62a0ea59a6cfb61367c39bc99276670efd5dfb SHA512 (libffi-3.4.2.tar.gz) = 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1 Size (libffi-3.4.2.tar.gz) = 1351355 bytes -SHA1 (patch-configure) = 604b205963e01c2dce7d5636543920abdd9c8638 +SHA1 (patch-configure) = 3976a6d3bf1c4b0fab9d62c2bde5c3675593a1eb SHA1 (patch-configure_host) = a4c99cd0fbbbe0f2c806d662b85a6e2c56b31168 SHA1 (patch-src_aarch64_ffi.c) = 016c504c55780a89ad2ecf17fea2355c9d1ac06d SHA1 (patch-src_arm_sysv.S) = 9aaa8e12e627d68126fbc4ff02e06ed45c94da1a diff --git a/devel/libffi/patches/patch-configure b/devel/libffi/patches/patch-configure index 49330678bbb2..31b087e65a0b 100644 --- a/devel/libffi/patches/patch-configure +++ b/devel/libffi/patches/patch-configure @@ -1,6 +1,8 @@ -$NetBSD: patch-configure,v 1.2 2020/04/24 10:19:32 dsainty Exp $ +$NetBSD: patch-configure,v 1.3 2022/01/09 20:07:00 tm Exp $ -Add NetBSD support. +Cannot use malloc on this target (NetBSD, Solaris), so, we revert to +alternative means. Important is *-*-netbsd* and the change from *-pc-solaris* +to *-*-solaris*. --- configure.orig 2019-11-23 13:59:04.000000000 +0000 +++ configure @@ -9,7 +11,7 @@ Add NetBSD support. ;; - *-apple-* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-linux-android*) -+ *-apple-* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-pc-solaris* | *-linux-android*) ++ *-apple-* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-*-solaris* | *-linux-android*) $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h