diff --git a/dev-libs/libffi/libffi-3.4.2.recipe b/dev-libs/libffi/libffi-3.4.6.recipe similarity index 82% rename from dev-libs/libffi/libffi-3.4.2.recipe rename to dev-libs/libffi/libffi-3.4.6.recipe index 5734dafb5..771b07823 100644 --- a/dev-libs/libffi/libffi-3.4.2.recipe +++ b/dev-libs/libffi/libffi-3.4.6.recipe @@ -7,17 +7,20 @@ plugins." HOMEPAGE="https://sourceware.org/libffi" COPYRIGHT="1996-2021 Anthony Green, Red Hat, Inc and others." LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/libffi/libffi/releases/download/v$portVersion/libffi-$portVersion.tar.gz" -CHECKSUM_SHA256="540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620" +CHECKSUM_SHA256="b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e" PATCHES="libffi-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +libVersion="8.1.4" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libffi$secondaryArchSuffix = $portVersion compat >= 3 - lib:libffi$secondaryArchSuffix = 8.0.1 compat >= 8 + lib:libffi$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -25,7 +28,7 @@ REQUIRES=" PROVIDES_devel=" libffi${secondaryArchSuffix}_devel = $portVersion - devel:libffi$secondaryArchSuffix = 8.0.1 compat >= 8 + devel:libffi$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libffi$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/libffi/patches/libffi-3.4.2.patchset b/dev-libs/libffi/patches/libffi-3.4.6.patchset similarity index 70% rename from dev-libs/libffi/patches/libffi-3.4.2.patchset rename to dev-libs/libffi/patches/libffi-3.4.6.patchset index 700f56d40..33125496e 100644 --- a/dev-libs/libffi/patches/libffi-3.4.2.patchset +++ b/dev-libs/libffi/patches/libffi-3.4.6.patchset @@ -1,14 +1,14 @@ -From f32feb728fef969265603f6476ebc2bb05d5b74f Mon Sep 17 00:00:00 2001 +From 34946f2c489cd7448f8d2ddb6575e7f71a1c80e7 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Aug 2021 09:28:50 +0300 Subject: gcc2 fix. diff --git a/include/ffi_common.h b/include/ffi_common.h -index 2bd31b0..d9e1997 100644 +index a9839b3..4676094 100644 --- a/include/ffi_common.h +++ b/include/ffi_common.h -@@ -165,7 +165,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); +@@ -171,7 +171,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); typedef float FLOAT32; @@ -18,10 +18,10 @@ index 2bd31b0..d9e1997 100644 #endif #define LIKELY(x) __builtin_expect(!!(x),1) -- -2.30.2 +2.45.2 -From 3fb7941ca3d21a00ae902d67b8e1b545980bb616 Mon Sep 17 00:00:00 2001 +From 0326e69b99561fbeded2d58bdbd4e6e93af95acd Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 16 Aug 2021 09:29:06 +0300 Subject: Mark Haiku as needing PROT_WRITE | PROTO_EXEC for allocations. @@ -31,18 +31,18 @@ in Haiku so function calls into there will segfault with a permission denied error. diff --git a/configure b/configure -index 94e149c..c66f2aa 100755 +index bcbbd44..7086b47 100755 --- a/configure +++ b/configure -@@ -18658,7 +18658,7 @@ case "$target" in - $as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h +@@ -19350,7 +19350,7 @@ case "$target" in + printf "%s\n" "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h ;; - *-apple-* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-linux-android*) + *-apple-* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-linux-android* | *-*-haiku*) - $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h + printf "%s\n" "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h -- -2.30.2 +2.45.2