[vlc-commits] macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac

David Fuhrmann git at videolan.org
Sun Jan 24 11:21:02 UTC 2021


vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Jan 24 12:18:08 2021 +0100| [5dd2501b3ebdab86ad8f9238aceb403d0e7ffa7c] | 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/vlc-3.0.git/?a=commit;h=5dd2501b3ebdab86ad8f9238aceb403d0e7ffa7c
---

 extras/package/macosx/build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index bbfa66f444..8c16fb711f 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -263,7 +263,13 @@ if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
 
 else
 if [ ! -e "../$HOST_TRIPLET" ]; then
-    make prebuilt > $out
+    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