haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libffi: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2021-08-16 13:15:14 +03:00
parent 8cbac8a8a8
commit 46a864c9ee
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-libs/libffi/libffi-3.2.1.recipe → dev-libs/libffi/libffi-3.4.2.recipe
View File

@@ -4,12 +4,12 @@ user a C programming language interface used to call natively compiled \
functions. Libffi is typically used as a bridging technology between compiled \
and interpreted language implementations. It can also be used to implement \
plugins."
HOMEPAGE="http://sourceware.org/libffi"
COPYRIGHT="1996-2013 Anthony Green, Red Hat, Inc and others."
HOMEPAGE="https://sourceware.org/libffi"
COPYRIGHT="1996-2021 Anthony Green, Red Hat, Inc and others."
LICENSE="MIT"
REVISION="6"
SOURCE_URI="ftp://sourceware.org/pub/libffi/libffi-$portVersion.tar.gz"
CHECKSUM_SHA256="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
REVISION="1"
SOURCE_URI="https://github.com/libffi/libffi/releases/download/v$portVersion/libffi-$portVersion.tar.gz"
CHECKSUM_SHA256="540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620"
PATCHES="libffi-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 sparc m68k"
@@ -17,7 +17,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PROVIDES="
libffi$secondaryArchSuffix = $portVersion compat >= 3
lib:libffi$secondaryArchSuffix = 6.0.4 compat >= 6
lib:libffi$secondaryArchSuffix = 8.0.1 compat >= 8
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -25,7 +25,7 @@ REQUIRES="
PROVIDES_devel="
libffi${secondaryArchSuffix}_devel = $portVersion
devel:libffi$secondaryArchSuffix = 6.0.4 compat >= 6
devel:libffi$secondaryArchSuffix = 8.0.1 compat >= 8
"
REQUIRES_devel="
libffi$secondaryArchSuffix == $portVersion base
@@ -52,7 +52,6 @@ INSTALL()
rm $libDir/libffi.la
mkdir -p $includeDir
mv -f $libDir/libffi-$portVersion/include/*.h* $includeDir
rm -rf $libDir/libffi-$portVersion
prepareInstalledDevelLibs libffi

24
dev-libs/libffi/patches/libffi-3.2.1.patchset → dev-libs/libffi/patches/libffi-3.4.2.patchset
View File

@@ -1,14 +1,14 @@
From 7346bc44a1d1f47b38d556b0cc291fc948725042 Mon Sep 17 00:00:00 2001
From f32feb728fef969265603f6476ebc2bb05d5b74f Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 21 Sep 2014 18:59:06 +0200
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 650ca69..02a1913 100644
index 2bd31b0..d9e1997 100644
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -115,7 +115,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__)));
@@ -165,7 +165,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__)));
typedef float FLOAT32;
@@ -18,12 +18,12 @@ index 650ca69..02a1913 100644
#endif
#define LIKELY(x) __builtin_expect(!!(x),1)
--
1.8.3.4
2.30.2
From 46ac95d3636b845de417cc97c426b98c89d9ea54 Mon Sep 17 00:00:00 2001
From 3fb7941ca3d21a00ae902d67b8e1b545980bb616 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Fri, 12 Jun 2020 13:14:57 +0000
Date: Mon, 16 Aug 2021 09:29:06 +0300
Subject: Mark Haiku as needing PROT_WRITE | PROTO_EXEC for allocations.
It uses the heap as a fallback, but its areas are marked non-executable
@@ -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 c6da467..d856e1a 100755
index 94e149c..c66f2aa 100755
--- a/configure
+++ b/configure
@@ -18530,7 +18530,7 @@ case "$target" in
@@ -18658,7 +18658,7 @@ case "$target" in
$as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
;;
- *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
+ *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-*-haiku*)
- *-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
--
2.26.0
2.30.2