Created
January 24, 2022 17:57
-
-
Save ci7lus/52d98287b418900e9541c1d24cc8395f to your computer and use it in GitHub Desktop.
vlc skip same arch cache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile.am b/Makefile.am | |
index dd282b23cc..dc353dddbd 100644 | |
--- a/Makefile.am | |
+++ b/Makefile.am | |
@@ -169,10 +169,7 @@ if BUILD_VLC | |
############################################################################### | |
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" ; \ | |
+ echo "skip install-exec-hook" ; \ | |
else \ | |
echo "Cross-compilation: cache generation skipped!" ; \ | |
fi | |
diff --git a/bin/Makefile.am b/bin/Makefile.am | |
index 257a065797..16d9bb8045 100644 | |
--- a/bin/Makefile.am | |
+++ b/bin/Makefile.am | |
@@ -143,7 +143,7 @@ endif | |
../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` ; \ | |
+ echo "skip install-exec-hook" ; \ | |
else \ | |
echo "Cross-compilation: cache generation skipped!" ; \ | |
fi | |
diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak | |
index 31d8ba665d..860f4d915f 100644 | |
--- a/extras/package/macosx/package.mak | |
+++ b/extras/package/macosx/package.mak | |
@@ -59,7 +59,7 @@ endif | |
cp $(prefix)/bin/vlc $@/Contents/MacOS/VLC | |
## Generate plugin cache | |
if test "$(build)" = "$(host)"; then \ | |
- bin/vlc-cache-gen $@/Contents/MacOS/plugins ; \ | |
+ echo "skip install-exec-hook" ; \ | |
else \ | |
echo "Cross-compilation: cache generation skipped!" ; \ | |
fi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment