From: Sebastian Ramacher <sramacher@debian.org>
Date: Mon, 6 Jul 2020 22:18:39 +0000 (+0200)
Subject: Do not generate cache during build
X-Git-Tag: archive/raspbian/3.0.11.1-2+rpi1~1^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3fb616e50c82db3302ab77d846e1318adaecd2c2;p=vlc.git

Do not generate cache during build

The generated cache is not used in the package. It causes spurious build
failures on the arm64 and ppc64el builds, that are not reproducible
elsewhere.

Gbp-Pq: Name 0003-Do-not-generate-cache-during-build.patch
---

diff --git a/Makefile.am b/Makefile.am
index 3ac82623..6a3b7a02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,21 +157,6 @@ endif
 TESTS = test/run_vlc.sh
 dist_noinst_SCRIPTS += test/run_vlc.sh
 
-if BUILD_VLC
-###############################################################################
-# Installing plugins cache
-###############################################################################
-install-exec-hook:
-	if test "$(build)" = "$(host)"; then \
-		PATH="$(DESTDIR)$(bindir):$$PATH" \
-		LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
-		"$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-			 "$(DESTDIR)$(vlclibdir)/plugins" ; \
-	else \
-		echo "Cross-compilation: cache generation skipped!" ; \
-	fi
-endif
-
 uninstall-hook:
 	rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat"
 
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2877e8b0..2629afce 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -121,14 +121,6 @@ vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
 vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
 endif
 
-#
-# Plug-ins cache
-#
-if HAVE_DYNAMIC_PLUGINS
-noinst_DATA = ../modules/plugins.dat
-endif
-MOSTLYCLEANFILES = $(noinst_DATA)
-
 if HAVE_OSX
 if BUILD_VLC
 install-data-local:
@@ -136,13 +128,3 @@ install-data-local:
 
 endif
 endif
-
-.PHONY: ../modules/plugins.dat
-
-../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
-	$(AM_V_at)rm -f ../modules/plugins.dat
-	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
-		./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \
-	else \
-		echo "Cross-compilation: cache generation skipped!" ; \
-	fi