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 35ee1e85d8afd92c82547b23d4569f5635c975c1..4c7a99c851d1f75153a79a595d1c648aefff264d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,21 +161,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 257a065797e8b9141f9a0f91b5c0f588634ee848..685ce5e6393270d04d7012a270e09d9c6091dfcb 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -122,14 +122,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:
@@ -137,13 +129,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