update version to 3.4.2

e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch

@@ -1,61 +0,0 @@
-diff --git a/msvcc.sh b/msvcc.sh
-index 97facd69..7cfc5097 100755
---- a/msvcc.sh
-+++ b/msvcc.sh
-@@ -165,24 +165,24 @@ do
-       shift 1
-     ;;
-     -I)
--      p=$(cygpath -m $2)
--      args="$args -I$p"
--      includes="$includes -I$p"
-+      p=$(cygpath -ma "$2")
-+      args="$args -I\"$p\""
-+      includes="$includes -I\"$p\""
-       shift 2
-     ;;
-     -I*)
--      p=$(cygpath -m ${1#-I})
--      args="$args -I$p"
--      includes="$includes -I$p"
-+      p=$(cygpath -ma "${1#-I}")
-+      args="$args -I\"$p\""
-+      includes="$includes -I\"$p\""
-       shift 1
-     ;;
-     -L)
--      p=$(cygpath -m $2)
-+      p=$(cygpath -ma $2)
-       linkargs="$linkargs -LIBPATH:$p"
-       shift 2
-     ;;
-     -L*)
--      p=$(cygpath -m ${1#-L})
-+      p=$(cygpath -ma ${1#-L})
-       linkargs="$linkargs -LIBPATH:$p"
-       shift 1
-     ;;
-@@ -256,12 +256,12 @@ do
-       shift 2
-     ;;
-     *.S)
--      src=$1
-+      src="$(cygpath -ma $1)"
-       assembly="true"
-       shift 1
-     ;;
-     *.c)
--      args="$args $1"
-+      args="$args $(cygpath -ma $1)"
-       shift 1
-     ;;
-     *)
-@@ -312,7 +312,7 @@ if [ -n "$assembly" ]; then
-       echo "$cl -nologo -EP $includes $defines $src > $ppsrc"
-     fi
- 
--    "$cl" -nologo -EP $includes $defines $src > $ppsrc || exit $?
-+    eval "\"$cl\" -nologo -EP $includes $defines $src" > $ppsrc || exit $?
-     output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')"
-     if [ $ml = "armasm" ]; then
-       args="-nologo -g -oldit $armasm_output $ppsrc -errorReport:prompt"

ffi-multilib.h

@@ -0,0 +1,23 @@
+/* This file is here to prevent a file conflict on multiarch systems. */
+#ifdef ffi_wrapper_h
+#error "Do not define ffi_wrapper_h!"
+#endif
+#define ffi_wrapper_h
+
+#if defined(__i386__)
+#include "ffi-i386.h"
+#elif defined(__powerpc64__)
+#include "ffi-ppc64.h"
+#elif defined(__powerpc__)
+#include "ffi-ppc.h"
+#elif defined(__s390x__)
+#include "ffi-s390x.h"
+#elif defined(__s390__)
+#include "ffi-s390.h"
+#elif defined(__x86_64__)
+#include "ffi-x86_64.h"
+#else
+#error "The libffi-devel package is not usable with the architecture."
+#endif
+
+#undef ffi_wrapper_h

ffitarget-multilib.h

@@ -0,0 +1,23 @@
+/* This file is here to prevent a file conflict on multiarch systems. */
+#ifdef ffitarget_wrapper_h
+#error "Do not define ffitarget_wrapper_h!"
+#endif
+#define ffitarget_wrapper_h
+
+#if defined(__i386__)
+#include "ffitarget-i386.h"
+#elif defined(__powerpc64__)
+#include "ffitarget-ppc64.h"
+#elif defined(__powerpc__)
+#include "ffitarget-ppc.h"
+#elif defined(__s390x__)
+#include "ffitarget-s390x.h"
+#elif defined(__s390__)
+#include "ffitarget-s390.h"
+#elif defined(__x86_64__)
+#include "ffitarget-x86_64.h"
+#else
+#error "The libffi-devel package is not usable with the architecture."
+#endif
+
+#undef ffitarget_wrapper_h

libffi.spec

@@ -1,13 +1,14 @@
 Name:		libffi
-Version:	3.3
-Release:	11
+Version:	3.4.2
+Release:	1
 Summary:	A Portable Foreign Function Interface Library
 License:	MIT
 URL:		http://sourceware.org/libffi
-Source0:	ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
-Patch6000:	e70bf987daa7b7b5df2de7579d5c51a888e8bf7d.patch
+Source0:	https://github.com/libffi/libffi/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source1:	ffi-multilib.h
+Source2:	ffitarget-multilib.h
 
-BuildRequires:	gcc
+BuildRequires:	gcc gcc-c++ dejagnu libffi
 
 %description
 Compilers for high level languages generate code that follows certain conventions. These
@@ -55,7 +56,7 @@ The help package contains man files.
 %ifarch riscv64
 	--disable-multi-os-directory \
 %endif
-	--disable-static
+	--disable-static --disable-exec-static-tramp
 	
 %make_build
 
@@ -63,12 +64,13 @@ The help package contains man files.
 %make_install
 %delete_la
 
+cp -a %{_libdir}/libffi.so.7* $RPM_BUILD_ROOT%{_libdir}
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %ldconfig_scriptlets
 
 %check
-make check
+%make_build check
 
 %post help
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libffi.info.gz || :
@@ -92,6 +94,12 @@ fi
 %{_infodir}/libffi.info.gz
 
 %changelog
+* Fri Dec 3 2021 panxiaohe<panxiaohe@huawei.com> - 3.4.2-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update version to 3.4.2
+
 * Thu Jul 22 2021 panxiaohe<panxiaohe@huawei.com> - 3.3-11
 - remove unnecessary BuildRequires: gdb