[vlc-devel] [VLC-3.0 2/3] contrib: libarchive: fix CPP being detected incorrectly

[Alexandre Janniaux]

The preprocessor is not detected and it leads to failure with empty
$CPP variable being used on la_TYPE_UID_T, leading to a cascade of
detection errors and redefinition of some types.

PR sent upstream as https://github.com/libarchive/libarchive/pull/1481.

Cherry-picked from 17652505b49e98721a6351102c8fd7b026bc61dc.
---
 .../configure.ac-add-AC_PROG_CPP.patch        | 27 +++++++++++++++++++
 contrib/src/libarchive/rules.mak              |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch

diff --git a/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch b/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch
new file mode 100644
index 0000000000..cdec009ef1
--- /dev/null
+++ b/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch
@@ -0,0 +1,27 @@
+From b4c5bf51436d876631e12ed8533e86405f8581d7 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni at videolabs.io>
+Date: Mon, 11 Jan 2021 12:31:53 +0100
+Subject: [PATCH] configure.ac: add AC_PROG_CPP
+
+Otherwise, the preprocessor is not detected and it leads to failure with
+empty $CPP variable being used on la_TYPE_UID_T, leading to a cascade of
+detection errors and redefinition of some types.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 3b4602f5..d51fa19c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,6 +107,7 @@ AC_SUBST(PLATFORMCPPFLAGS)
+ AC_PROG_CC
+ AC_PROG_CC_C99
+ AM_PROG_CC_C_O
++AC_PROG_CPP
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+-- 
+2.30.0
+
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 76eb29e13a..6c6f3cb039 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -25,6 +25,7 @@ endif
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/libarchive/winrt.patch
 endif
+	$(APPLY) $(SRC)/libarchive/configure.ac-add-AC_PROG_CPP.patch
 	$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
 	$(MOVE)
 
-- 
2.30.0