Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libffi: update to 3.4.3 with fixes

Browse Source 
libffi-3.4.3 fixes e.g. the guile test-suite/standalone/test-ffi
'procedure->pointer and test-suite/standalone/test-loose-ends.c
scm_procedure_to_pointer

MSYS2 specific patches have been included upstream.
This commit is contained in:
Hannes Müller 2022-09-20 20:39:33 +02:00
parent e2dd58640f
commit e96e2aba8b
2 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libffi/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgbase=libffi
pkgname=('libffi' 'libffi-devel')
pkgver=3.4.2
pkgver=3.4.3
pkgrel=1
pkgdesc="Portable, high level programming interface to various calling conventions"
arch=('i686' 'x86_64')
@ -12,14 +12,11 @@ license=('MIT')
depends=()
checkdepends=('dejagnu')
makedepends=('autotools' 'gcc')
source=(https://github.com/libffi/libffi/releases/download/v$pkgver/libffi-$pkgver.tar.gz
libffi-3.3-msysize.patch)
sha256sums=('540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620'
'75903de0b39311775e2d5d2f0d7f1b5935168698a54198e0f33ffb9e32c16c84')
source=(https://github.com/libffi/libffi/releases/download/v$pkgver/libffi-$pkgver.tar.gz)
sha256sums=('4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8')
prepare() {
cd ${pkgname}-${pkgver}
patch -p1 -i ${srcdir}/libffi-3.3-msysize.patch
autoreconf -vfi
}
@ -55,7 +52,8 @@ package_libffi() {
mkdir -p ${pkgdir}/usr/bin
cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
cp -rf ${srcdir}/dest/usr/share ${pkgdir}/usr/
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
package_libffi-devel() {
@ -63,8 +61,6 @@ package_libffi-devel() {
groups=('development')
if check_option "debug" "y"; then
options=('staticlibs' '!strip' 'debug')
else
options=('staticlibs' '!strip' 'debug')
fi
depends=("libffi=${pkgver}")

53
libffi/libffi-3.3-msysize.patch
View File

@ -1,53 +0,0 @@
diff -Naur libffi-3.3-orig/configure.host libffi-3.3/configure.host
--- libffi-3.3-orig/configure.host 2019-11-23 02:55:36.000000000 +0300
+++ libffi-3.3/configure.host 2020-04-15 11:34:06.382013100 +0300
@@ -6,7 +6,7 @@
# THIS TABLE IS SORTED. KEEP IT THAT WAY.
# Most of the time we can define all the variables all at once...
case "${host}" in
- aarch64*-*-cygwin* | aarch64*-*-mingw* | aarch64*-*-win* )
+ aarch64*-*-cygwin* | aarch64*-*-msys* | aarch64*-*-mingw* | aarch64*-*-win* )
TARGET=ARM_WIN64; TARGETDIR=aarch64
MSVC=1
;;
@@ -28,7 +28,7 @@
SOURCES="ffi.c arcompact.S"
;;
- arm*-*-cygwin* | arm*-*-mingw* | arm*-*-win* )
+ arm*-*-cygwin* | arm*-*-msys* | arm*-*-mingw* | arm*-*-win* )
TARGET=ARM_WIN32; TARGETDIR=arm
MSVC=1
;;
@@ -74,8 +74,8 @@
TARGET=X86_FREEBSD; TARGETDIR=x86
;;
- i?86-*-cygwin* | i?86-*-mingw* | i?86-*-win* | i?86-*-os2* | i?86-*-interix* \
- | x86_64-*-cygwin* | x86_64-*-mingw* | x86_64-*-win* )
+ i?86-*-cygwin* | i?86-*-msys* | i?86-*-mingw* | i?86-*-win* | i?86-*-os2* | i?86-*-interix* \
+ | x86_64-*-cygwin* | x86_64-*-msys* | x86_64-*-mingw* | x86_64-*-win* )
TARGETDIR=x86
if test $ac_cv_sizeof_size_t = 4; then
TARGET=X86_WIN32
diff -Naur libffi-3.3-orig/testsuite/lib/target-libpath.exp libffi-3.3/testsuite/lib/target-libpath.exp
--- libffi-3.3-orig/testsuite/lib/target-libpath.exp 2019-10-31 17:49:54.000000000 +0300
+++ libffi-3.3/testsuite/lib/target-libpath.exp 2020-04-15 11:39:08.220834800 +0300
@@ -175,7 +175,7 @@
} else {
setenv DYLD_LIBRARY_PATH "$ld_library_path"
}
- if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } {
+ if { [istarget *-*-cygwin*] || [ istarget *-*-msys* ] || [istarget *-*-mingw*] } {
if { $orig_path_saved } {
setenv PATH "$ld_library_path:$orig_path"
} else {
@@ -271,7 +271,7 @@
if { [ istarget *-*-darwin* ] } {
set shlib_ext "dylib"
- } elseif { [ istarget *-*-cygwin* ] || [ istarget *-*-mingw* ] } {
+ } elseif { [ istarget *-*-cygwin* ] || [ istarget *-*-msys* ] || [ istarget *-*-mingw* ] } {
set shlib_ext "dll"
} elseif { [ istarget hppa*-*-hpux* ] } {
set shlib_ext "sl"