[vlc-commits] apple: build.sh: explicitely forward ac_cv_ vars
Alexandre Janniaux
git at videolan.org
Sat Mar 13 13:06:27 UTC 2021
vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Sat Feb 20 10:17:19 2021 +0100| [c4acef442fe306c743550a991a18def2e8e1f570] | committer: Alexandre Janniaux
apple: build.sh: explicitely forward ac_cv_ vars
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c4acef442fe306c743550a991a18def2e8e1f570
---
extras/package/apple/build.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 7877bf9676..460851a468 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -588,9 +588,6 @@ else
echo "Building contribs for $VLC_HOST_ARCH"
fi
-# Set symbol blacklist for autoconf
-vlcSetSymbolEnvironment > /dev/null
-
# Combine settings from config file
VLC_CONTRIB_OPTIONS=( "${VLC_CONTRIB_OPTIONS_BASE[@]}" )
@@ -625,8 +622,10 @@ write_config_mak "-Werror=partial-availability"
if [ "$VLC_USE_PREBUILT_CONTRIBS" -gt "0" ]; then
# Fetch prebuilt contribs
if [ -z "$VLC_PREBUILT_CONTRIBS_URL" ]; then
+ vlcSetSymbolEnvironment \
$MAKE prebuilt || abort_err "Fetching prebuilt contribs failed"
else
+ vlcSetSymbolEnvironment \
$MAKE prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" \
|| abort_err "Fetching prebuilt contribs from ${VLC_PREBUILT_CONTRIBS_URL} failed"
fi
@@ -638,10 +637,12 @@ else
$MAKE fetch
# Build contribs
+ vlcSetSymbolEnvironment \
$MAKE || abort_err "Building contribs failed"
# Make prebuilt contribs package
if [ "$VLC_MAKE_PREBUILT_CONTRIBS" -gt "0" ]; then
+ vlcSetSymbolEnvironment \
$MAKE package || abort_err "Creating prebuilt contribs package failed"
fi
fi
@@ -692,6 +693,7 @@ cd "${VLC_BUILD_DIR}/build" || abort_err "Failed cd to VLC build dir"
# Create VLC install dir if it does not already exist
mkdir -p "$VLC_INSTALL_DIR"
+vlcSetSymbolEnvironment \
hostenv ../../configure \
--with-contrib="$VLC_CONTRIB_INSTALL_DIR" \
--host="$VLC_HOST_TRIPLET" \
More information about the vlc-commits
mailing list