|
0 |
From: Sebastian Ramacher <sramacher@debian.org>
|
|
1 |
Date: Tue, 7 Jul 2020 00:18:39 +0200
|
|
2 |
Subject: Do not generate cache during build
|
|
3 |
|
|
4 |
The generated cache is not used in the package. It causes spurious build
|
|
5 |
failures on the arm64 and ppc64el builds, that are not reproducible
|
|
6 |
elsewhere.
|
|
7 |
---
|
|
8 |
Makefile.am | 15 ---------------
|
|
9 |
bin/Makefile.am | 18 ------------------
|
|
10 |
2 files changed, 33 deletions(-)
|
|
11 |
|
|
12 |
diff --git a/Makefile.am b/Makefile.am
|
|
13 |
index 3ac8262..6a3b7a0 100644
|
|
14 |
--- a/Makefile.am
|
|
15 |
+++ b/Makefile.am
|
|
16 |
@@ -157,21 +157,6 @@ endif
|
|
17 |
TESTS = test/run_vlc.sh
|
|
18 |
dist_noinst_SCRIPTS += test/run_vlc.sh
|
|
19 |
|
|
20 |
-if BUILD_VLC
|
|
21 |
-###############################################################################
|
|
22 |
-# Installing plugins cache
|
|
23 |
-###############################################################################
|
|
24 |
-install-exec-hook:
|
|
25 |
- if test "$(build)" = "$(host)"; then \
|
|
26 |
- PATH="$(DESTDIR)$(bindir):$$PATH" \
|
|
27 |
- LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
|
|
28 |
- "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
|
|
29 |
- "$(DESTDIR)$(vlclibdir)/plugins" ; \
|
|
30 |
- else \
|
|
31 |
- echo "Cross-compilation: cache generation skipped!" ; \
|
|
32 |
- fi
|
|
33 |
-endif
|
|
34 |
-
|
|
35 |
uninstall-hook:
|
|
36 |
rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat"
|
|
37 |
|
|
38 |
diff --git a/bin/Makefile.am b/bin/Makefile.am
|
|
39 |
index 2877e8b..2629afc 100644
|
|
40 |
--- a/bin/Makefile.am
|
|
41 |
+++ b/bin/Makefile.am
|
|
42 |
@@ -121,14 +121,6 @@ vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
|
|
43 |
vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
|
|
44 |
endif
|
|
45 |
|
|
46 |
-#
|
|
47 |
-# Plug-ins cache
|
|
48 |
-#
|
|
49 |
-if HAVE_DYNAMIC_PLUGINS
|
|
50 |
-noinst_DATA = ../modules/plugins.dat
|
|
51 |
-endif
|
|
52 |
-MOSTLYCLEANFILES = $(noinst_DATA)
|
|
53 |
-
|
|
54 |
if HAVE_OSX
|
|
55 |
if BUILD_VLC
|
|
56 |
install-data-local:
|
|
57 |
@@ -136,13 +128,3 @@ install-data-local:
|
|
58 |
|
|
59 |
endif
|
|
60 |
endif
|
|
61 |
-
|
|
62 |
-.PHONY: ../modules/plugins.dat
|
|
63 |
-
|
|
64 |
-../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
|
|
65 |
- $(AM_V_at)rm -f ../modules/plugins.dat
|
|
66 |
- $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
|
|
67 |
- ./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \
|
|
68 |
- else \
|
|
69 |
- echo "Cross-compilation: cache generation skipped!" ; \
|
|
70 |
- fi
|