[vlc-commits] macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac
David Fuhrmann
git at videolan.org
Tue Jan 26 10:10:09 UTC 2021
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Tue Jan 26 10:56:49 2021 +0100| [8e29a54120c85cdee65df25e83ec0b4c7a9a9dcb] | committer: David Fuhrmann
macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac
luac is a native tool not being bundled in the prebuilt contribs
so far. Therefore this needs to be rebuilt.
Also respect VLC_PREBUILT_CONTRIBS_URL, analog to the windows
build scripts.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e29a54120c85cdee65df25e83ec0b4c7a9a9dcb
---
extras/package/macosx/build.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 18cde8bc4f..5d796dafe9 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -177,8 +177,14 @@ if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
fi
else
-if [ ! -e "../$TRIPLET" ]; then
- make prebuilt > $out
+if [ ! -e "../$HOST_TRIPLET" ]; then
+ if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
+ make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
+ make .luac
+ else
+ make prebuilt
+ make .luac
+ fi
fi
fi
spopd
More information about the vlc-commits
mailing list