Do not generate cache during build
authorSebastian Ramacher <sramacher@debian.org>
Mon, 6 Jul 2020 22:18:39 +0000 (00:18 +0200)
committerSebastian Ramacher <sramacher@debian.org>
Mon, 20 Jul 2020 20:45:52 +0000 (21:45 +0100)
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

Makefile.am
bin/Makefile.am

index 3ac82623ad4f5307465be8dba4e8be925cc378e5..6a3b7a026f5a7560f2c245d32ac49233dcd5c445 100644 (file)
@@ -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"
 
index 2877e8b0ead9ac7dc3f8ef64c43f62e7d6087a4e..2629afce6906c50833dcd80f07ed183cf6918678 100644 (file)
@@ -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