[vlc-commits] extras: macOS build script cosmetics
Felix Paul Kühne
git at videolan.org
Fri Dec 4 06:30:58 UTC 2020
vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Fri Dec 4 07:20:44 2020 +0100| [c9048edc4aba2eaa8f5b92baa8b8daf411128ce9] | committer: Felix Paul Kühne
extras: macOS build script cosmetics
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c9048edc4aba2eaa8f5b92baa8b8daf411128ce9
---
extras/package/macosx/build.sh | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index d836a324c8..625438a048 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -123,7 +123,11 @@ if [ "$QUIET" = "yes" ]; then
out="/dev/null"
fi
-info "Building VLC for the Mac OS X"
+BUILD_TRIPLET=$BUILD_ARCH-apple-darwin$OSX_KERNELVERSION
+HOST_TRIPLET=$ARCH-apple-darwin$OSX_KERNELVERSION
+ACTUAL_ARCH=`get_actual_arch $ARCH`
+
+info "Building VLC for macOS for architecture ${ACTUAL_ARCH} on a ${BUILD_ARCH} device"
spushd `dirname $0`/../../..
vlcroot=`pwd`
@@ -133,10 +137,6 @@ builddir=`pwd`
info "Building in \"$builddir\""
-BUILD_TRIPLET=$BUILD_ARCH-apple-darwin$OSX_KERNELVERSION
-HOST_TRIPLET=$ARCH-apple-darwin$OSX_KERNELVERSION
-ACTUAL_ARCH=`get_actual_arch $ARCH`
-
python3Path=$(echo /Library/Frameworks/Python.framework/Versions/3.*/bin | awk '{print $1;}')
if [ ! -d "$python3Path" ]; then
python3Path=""
@@ -153,7 +153,6 @@ export STRIP="`xcrun --find strip`"
export SDKROOT
export PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
-
# Select avcodec flavor to compile contribs with
export USE_FFMPEG=1
@@ -310,7 +309,6 @@ if [ "${vlcroot}/configure" -nt Makefile ]; then
$VLC_CONFIGURE_ARGS > $out
fi
-
#
# make
#
@@ -326,7 +324,6 @@ make -j$JOBS
info "Preparing VLC.app"
make VLC.app
-
if [ "$PACKAGETYPE" = "u" ]; then
info "Copying app with debug symbols into VLC-debug.app and stripping"
rm -rf VLC-debug.app
More information about the vlc-commits
mailing list