[vlc-commits] apple: build.sh: use config.mak for symbol blacklist

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Thu Feb 25 09:48:46 2021 +0100| [7f1d7ea3da4cc57502e7f80bcc364475039ad2a8] | committer: Alexandre Janniaux

apple: build.sh: use config.mak for symbol blacklist

The list is written by the build script the first time, allowing further
tweaking and running `make` in the contrib build directory without
reexporting those ac_cv_ symbols again.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f1d7ea3da4cc57502e7f80bcc364475039ad2a8
---

 extras/package/apple/build.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 460851a468..1d030b3e63 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -344,6 +344,13 @@ hostenv()
     "$@"
 }
 
+ac_var_to_export_ac_var()
+{
+    for ac_var in "$@"; do
+        echo "export $ac_var"
+    done
+}
+
 # Write config.mak for contribs
 # Globals:
 #   VLC_DEPLOYMENT_TARGET_CFLAG
@@ -385,6 +392,10 @@ write_config_mak()
     printf '%s := %s\n' "STRIP" "${VLC_HOST_STRIP}" >&3
     printf '%s := %s\n' "RANLIB" "${VLC_HOST_RANLIB}" >&3
     printf '%s := %s\n' "NM" "${VLC_HOST_NM}" >&3
+
+    # Add the ac_cv_ var exports in the config.mak for the contribs
+    echo "Appending ac_cv_ vars to config.mak"
+    vlcSetSymbolEnvironment ac_var_to_export_ac_var >&3
 }
 
 # Generate the source file with the needed array for
@@ -622,10 +633,8 @@ 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
@@ -637,12 +646,10 @@ 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