From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Feb 2021 17:03:50 +0000 (+0000)
Subject: libffi: Update to 3.3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=870c02a5e8d27f212c8eafc87446021b3e8ea440;p=people%2Fpmueller%2Fipfire-2.x.git

libffi: Update to 3.3

This contains a version bump which requires us to ship Python 2 and
Python 3 again.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/libffi b/config/rootfiles/common/libffi
index 8d393d2212..e71caf1a2d 100644
--- a/config/rootfiles/common/libffi
+++ b/config/rootfiles/common/libffi
@@ -1,12 +1,10 @@
-#usr/lib/libffi-3.2.1
-#usr/lib/libffi-3.2.1/include
-#usr/lib/libffi-3.2.1/include/ffi.h
-#usr/lib/libffi-3.2.1/include/ffitarget.h
+#usr/include/ffi.h
+#usr/include/ffitarget.h
 #usr/lib/libffi.a
 #usr/lib/libffi.la
 #usr/lib/libffi.so
-usr/lib/libffi.so.6
-usr/lib/libffi.so.6.0.4
+usr/lib/libffi.so.7
+usr/lib/libffi.so.7.1.0
 #usr/lib/pkgconfig/libffi.pc
 #usr/share/info/libffi.info
 #usr/share/man/man3/ffi.3
diff --git a/lfs/libffi b/lfs/libffi
index 1d96e25a9d..1678505b6b 100644
--- a/lfs/libffi
+++ b/lfs/libffi
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.1
+VER        = 3.3
 
 THISAPP    = libffi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 83b89587607e3eb65c70d361f13bab43
+$(DL_FILE)_MD5 = 6313289e32f1d38a9df4770b014a2ca7
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -72,6 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install