https://github.com/libffi/libffi/releases/tag/v3.4.3 Minor bugfixes.
* Forward patches and redo them so they apply cleanly. * Add disable docs to configure options. Signed-off-by: Christian Melki <[email protected]> --- patches/libffi-3.4.2/series | 2 -- ...fi-Fix-location-of-libraries-for-multilib-toolch.patch | 4 ++-- ...ibffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch} | 8 +++----- patches/{libffi-3.4.2 => libffi-3.4.3}/autogen.sh | 0 patches/libffi-3.4.3/series | 5 +++++ rules/libffi.make | 5 +++-- 6 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 patches/libffi-3.4.2/series rename patches/{libffi-3.4.2 => libffi-3.4.3}/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch (89%) rename patches/{libffi-3.4.2/0002-not-win32.patch => libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch} (87%) rename patches/{libffi-3.4.2 => libffi-3.4.3}/autogen.sh (100%) create mode 100644 patches/libffi-3.4.3/series diff --git a/patches/libffi-3.4.2/series b/patches/libffi-3.4.2/series deleted file mode 100644 index 493d7a3c2..000000000 --- a/patches/libffi-3.4.2/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch -0002-not-win32.patch diff --git a/patches/libffi-3.4.2/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch b/patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch similarity index 89% rename from patches/libffi-3.4.2/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch rename to patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch index c47badd5f..bad669509 100644 --- a/patches/libffi-3.4.2/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch +++ b/patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch @@ -10,10 +10,10 @@ Signed-off-by: Christian Melki <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 4fd6193d9b21..e392009e1354 100644 +index a4a4887cbb62..cb457fec24db 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -34,7 +34,7 @@ MAKEOVERRIDES= +@@ -35,7 +35,7 @@ MAKEOVERRIDES= pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libffi.pc diff --git a/patches/libffi-3.4.2/0002-not-win32.patch b/patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch similarity index 87% rename from patches/libffi-3.4.2/0002-not-win32.patch rename to patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch index 62daaf4b3..686b9ad6b 100644 --- a/patches/libffi-3.4.2/0002-not-win32.patch +++ b/patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch @@ -1,4 +1,3 @@ -From 306719369a0d3608b4ff2737de74ae284788a14b Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Thu, 4 Feb 2016 16:22:50 +0000 Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc @@ -15,17 +14,16 @@ As this block is generally pointless, disable it. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <[email protected]> - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b764368..d51ce91 100644 +index ed394c9f9145..a3006b342c58 100644 --- a/configure.ac +++ b/configure.ac -@@ -354,7 +354,7 @@ AC_ARG_ENABLE(multi-os-directory, - +@@ -418,7 +418,7 @@ AC_ARG_ENABLE(multi-os-directory, + # These variables are only ever used when we cross-build to X86_WIN32. # And we only support this with GCC, so... -if test "x$GCC" = "xyes"; then diff --git a/patches/libffi-3.4.2/autogen.sh b/patches/libffi-3.4.3/autogen.sh similarity index 100% rename from patches/libffi-3.4.2/autogen.sh rename to patches/libffi-3.4.3/autogen.sh diff --git a/patches/libffi-3.4.3/series b/patches/libffi-3.4.3/series new file mode 100644 index 000000000..e7edd1e47 --- /dev/null +++ b/patches/libffi-3.4.3/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch +0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch +# 1a2be5d11f83cc2dc4277928237f651e - git-ptx-patches magic diff --git a/rules/libffi.make b/rules/libffi.make index b22dd266a..fe8ea11b6 100644 --- a/rules/libffi.make +++ b/rules/libffi.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi # # Paths and names # -LIBFFI_VERSION := 3.4.2 -LIBFFI_MD5 := 294b921e6cf9ab0fbaea4b639f8fdbe8 +LIBFFI_VERSION := 3.4.3 +LIBFFI_MD5 := b57b0ac1d1072681cee9148a417bd2ec LIBFFI := libffi-$(LIBFFI_VERSION) LIBFFI_SUFFIX := tar.gz LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) @@ -37,6 +37,7 @@ LIBFFI_CONF_OPT := \ --enable-portable-binary \ --disable-pax_emutramp \ --disable-debug \ + --disable-docs \ --enable-structs \ --enable-raw-api \ --disable-purify-safety \ -- 2.34.1
