<div dir="auto"><div dir="auto">Hi Alexandre,</div><div dir="auto"><br></div>Looks Good To Me. :)<br><br><div data-smartmail="gmail_signature">-- Sean McGovern</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue., Jan. 26, 2021, 13:58 Alexandre Janniaux, <<a href="mailto:ajanni@videolabs.io">ajanni@videolabs.io</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The preprocessor is not detected and it leads to failure with empty<br>
$CPP variable being used on la_TYPE_UID_T, leading to a cascade of<br>
detection errors and redefinition of some types.<br>
<br>
PR sent upstream as <a href="https://github.com/libarchive/libarchive/pull/1481" rel="noreferrer noreferrer" target="_blank">https://github.com/libarchive/libarchive/pull/1481</a>.<br>
<br>
Cherry-picked from 17652505b49e98721a6351102c8fd7b026bc61dc.<br>
---<br>
 .../configure.ac-add-AC_PROG_CPP.patch        | 27 +++++++++++++++++++<br>
 contrib/src/libarchive/rules.mak              |  1 +<br>
 2 files changed, 28 insertions(+)<br>
 create mode 100644 contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch<br>
<br>
diff --git a/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch b/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch<br>
new file mode 100644<br>
index 0000000000..cdec009ef1<br>
--- /dev/null<br>
+++ b/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch<br>
@@ -0,0 +1,27 @@<br>
+From b4c5bf51436d876631e12ed8533e86405f8581d7 Mon Sep 17 00:00:00 2001<br>
+From: Alexandre Janniaux <<a href="mailto:ajanni@videolabs.io" target="_blank" rel="noreferrer">ajanni@videolabs.io</a>><br>
+Date: Mon, 11 Jan 2021 12:31:53 +0100<br>
+Subject: [PATCH] <a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a>: add AC_PROG_CPP<br>
+<br>
+Otherwise, the preprocessor is not detected and it leads to failure with<br>
+empty $CPP variable being used on la_TYPE_UID_T, leading to a cascade of<br>
+detection errors and redefinition of some types.<br>
+---<br>
+ <a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a> | 1 +<br>
+ 1 file changed, 1 insertion(+)<br>
+<br>
+diff --git a/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
+index 3b4602f5..d51fa19c 100644<br>
+--- a/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
++++ b/<a href="http://configure.ac" rel="noreferrer noreferrer" target="_blank">configure.ac</a><br>
+@@ -107,6 +107,7 @@ AC_SUBST(PLATFORMCPPFLAGS)<br>
+ AC_PROG_CC<br>
+ AC_PROG_CC_C99<br>
+ AM_PROG_CC_C_O<br>
++AC_PROG_CPP<br>
+ AC_USE_SYSTEM_EXTENSIONS<br>
+ AC_LIBTOOL_WIN32_DLL<br>
+ AC_PROG_LIBTOOL<br>
+-- <br>
+2.30.0<br>
+<br>
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak<br>
index 76eb29e13a..6c6f3cb039 100644<br>
--- a/contrib/src/libarchive/rules.mak<br>
+++ b/contrib/src/libarchive/rules.mak<br>
@@ -25,6 +25,7 @@ endif<br>
 ifdef HAVE_WINSTORE<br>
        $(APPLY) $(SRC)/libarchive/winrt.patch<br>
 endif<br>
+       $(APPLY) $(SRC)/libarchive/configure.ac-add-AC_PROG_CPP.patch<br>
        $(call pkg_static,"build/pkgconfig/<a href="http://libarchive.pc.in" rel="noreferrer noreferrer" target="_blank">libarchive.pc.in</a>")<br>
        $(MOVE)<br>
<br>
-- <br>
2.30.0<br>
<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" rel="noreferrer noreferrer" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a></blockquote></div>