vlc | branch: master | Alexandre Janniaux <[email protected]> | Mon Jan 11 15:27:22 2021 +0100| [17652505b49e98721a6351102c8fd7b026bc61dc] | committer: Alexandre Janniaux
contrib: libarchive: fix CPP being detected incorrectly 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17652505b49e98721a6351102c8fd7b026bc61dc --- .../libarchive/configure.ac-add-AC_PROG_CPP.patch | 27 ++++++++++++++++++++++ contrib/src/libarchive/rules.mak | 1 + 2 files changed, 28 insertions(+) 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 <[email protected]> +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 fafcd56944..c88ab66030 100644 --- a/contrib/src/libarchive/rules.mak +++ b/contrib/src/libarchive/rules.mak @@ -34,6 +34,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) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
