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 0002-Do-not-generate-cache-during-build.patch

diff --git a/Makefile.am b/Makefile.am
index 51791983c977030c49139e02a3658c0010e6aa4c..08ad316db86c359c09c62e09b1f71dd0a26d175f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -163,22 +163,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" \
-               DYLD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$DYLD_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 4de299d394d4560dc5925f948076d6447b9897ba..a2acc3cd41bf060e42be6ccfd206461e8a6a0391 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -124,14 +124,6 @@ vlc_cache_gen_LDFLAGS = -Wc,-static
 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:
@@ -139,13 +131,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