From 29ac127718393bfc88240d6d37a631b9e32726b7 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 23 Feb 2022 11:51:29 +0100
Subject: [PATCH] extras: build native tools when using prebuilt contribs
Rather than force building .luac and .protoc all the time.
---
extras/ci/gitlab-ci.yml | 2 +-
extras/package/macosx/build.sh | 2 +-
extras/package/raspberry/build.sh | 4 ++--
extras/package/snap/snapcraft.yaml | 2 +-
extras/package/win32/build.sh | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index b7d03a6b912c..9ddf3d6b7654 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -242,7 +242,7 @@ debian:
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}"
- make -j$NCPU --output-sync=recurse .protoc
+ make -j$NCPU --output-sync=recurse tools
else
make list
make -j$NCPU --output-sync=recurse fetch
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 2d0d90ad13b3..1f323600cb79 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -183,7 +183,7 @@ if [ ! -e "../$HOST_TRIPLET" ]; then
else
make prebuilt
fi
- make .luac .protoc
+ make -j$JOBS tools
fi
fi
spopd
diff --git a/extras/package/raspberry/build.sh b/extras/package/raspberry/build.sh
index c93b16145d37..fdc0f68278be 100755
--- a/extras/package/raspberry/build.sh
+++ b/extras/package/raspberry/build.sh
@@ -130,10 +130,10 @@ if [ "$PREBUILT" != "yes" ]; then
fi
elif [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
- make -j$JOBS --output-sync=recurse .luac .protoc
+ make -j$JOBS --output-sync=recurse tools
else
make prebuilt
- make -j$JOBS --output-sync=recurse .luac .protoc
+ make -j$JOBS --output-sync=recurse tools
fi
cd ../..
diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml
index 6e6337e5820f..4252e8f355db 100644
--- a/extras/package/snap/snapcraft.yaml
+++ b/extras/package/snap/snapcraft.yaml
@@ -82,7 +82,7 @@ parts:
--disable-chromaprint
if [ -v VLC_PREBUILT_CONTRIBS_URL ]; then
make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
- make -j $(getconf _NPROCESSORS_ONLN) .protoc
+ make -j $(getconf _NPROCESSORS_ONLN) tools
else
make list
make -j $(getconf _NPROCESSORS_ONLN) fetch
diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 802c91ca9812..8c6155a51de5 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -333,7 +333,7 @@ else
else
make prebuilt
fi
- make .luac .protoc
+ make -j$JOBS tools
fi
cd ../..
--
GitLab