Update to libffi-3.3.

This commit is contained in:
Jonas 'Sortie' Termansen 2022-06-20 00:44:56 +02:00
parent 31d8c5d828
commit 795ef0529d
2 changed files with 7 additions and 41 deletions

View File

@ -1,19 +1,7 @@
diff -Paur --no-dereference -- libffi.upstream/config.sub libffi/config.sub
--- libffi.upstream/config.sub
+++ libffi/config.sub
@@ -1354,7 +1354,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
--- libffi.upstream/configure
+++ libffi/configure
@@ -20709,7 +20709,7 @@
@@ -20938,7 +20938,7 @@
eval "${MAKE-make} -f $tmp/conftemp.mk 2>/dev/null >/dev/null"
if grep '^REMOVED,,,' "$ac_top_srcdir/Makefile" >/dev/null
then rm $ac_top_srcdir/Makefile ; fi
@ -22,7 +10,7 @@ diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
fi
if test ! -f "$ac_top_srcdir/Makefile" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: create top_srcdir/Makefile guessed from local Makefile" >&5
@@ -20794,7 +20794,7 @@
@@ -21023,7 +21023,7 @@
; echo "\$\$i" | grep "^../" > /dev/null && continue \\\\\\
; echo "rm -r \$\$i"; (rm -r "\$\$i") ; done ; rm Makefile
_EOF
@ -31,7 +19,7 @@ diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
$ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >$ac_top_srcdir/Makefile
if test -f "$ac_top_srcdir/Makefile.mk" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5
@@ -20815,8 +20815,8 @@
@@ -21044,8 +21044,8 @@
# echo "/^$xxxx *$ax_enable_builddir_host /d" >$tmp/conftemp.sed
echo "s!^$xxxx [^|]* | *$ax_enable_builddir *\$!$xxxx ...... $ax_enable_builddir!" >$tmp/conftemp.sed
$ax_enable_builddir_sed -f "$tmp/conftemp.sed" "$ac_top_srcdir/Makefile" >$tmp/mkfile.tmp
@ -42,27 +30,3 @@ diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
if cmp -s "$ac_top_srcdir/Makefile" "$tmp/mkfile.tmp" 2>/dev/null ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: keeping top_srcdir/Makefile from earlier configure" >&5
$as_echo "$as_me: keeping top_srcdir/Makefile from earlier configure" >&6;}
diff -Paur --no-dereference -- libffi.upstream/include/Makefile.in libffi/include/Makefile.in
--- libffi.upstream/include/Makefile.in
+++ libffi/include/Makefile.in
@@ -314,7 +314,7 @@
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES = ffitarget.h
EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
nodist_includes_HEADERS = ffi.h ffitarget.h
all: all-am
diff -Paur --no-dereference -- libffi.upstream/libffi.pc.in libffi/libffi.pc.in
--- libffi.upstream/libffi.pc.in
+++ libffi/libffi.pc.in
@@ -2,7 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
toolexeclibdir=@toolexeclibdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces

View File

@ -1,11 +1,13 @@
NAME=libffi
BUILD_LIBRARIES=
VERSION=3.2.1
VERSION=3.3
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.gz
ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37
SHA256SUM=72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
UPSTREAM_SITE=https://sourceware.org/pub/libffi
UPSTREAM_ARCHIVE=$ARCHIVE
LICENSE=MIT
BUILD_SYSTEM=configure
POST_INSTALL=tix-eradicate-libtool-la
CONFIGURE_ARGS=--program-prefix=