[vlc-commits] [Git][videolan/vlc][master] 2 commits: appleOS build script: use bitcode support in contrib

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
bc9c39a3 by Felix Paul Kühne at 2022-04-14T11:36:39+00:00
appleOS build script: use bitcode support in contrib

- - - - -
627ab4fe by Felix Paul Kühne at 2022-04-14T11:36:39+00:00
appleOS build script: disable decklink

- - - - -


2 changed files:

- extras/package/apple/build.conf
- extras/package/apple/build.sh


Changes:

=====================================
extras/package/apple/build.conf
=====================================
@@ -72,6 +72,7 @@ export VLC_CONTRIB_OPTIONS_BASE=(
     --enable-taglib
     --disable-medialibrary
     --disable-sqlite
+    --disable-decklink
 )
 
 # Additional contrib bootstrap options for macOS


=====================================
extras/package/apple/build.sh
=====================================
@@ -323,7 +323,7 @@ set_host_envvars()
     local bitcode_flag=""
     if [ "$VLC_USE_BITCODE" -gt "0" ]; then
         clike_flags+=" $VLC_BITCODE_FLAG"
-        bitcode_flag=" $VLC_BTICODE_FLAG"
+        bitcode_flag=" $VLC_BITCODE_FLAG"
     fi
 
     export CPPFLAGS="-arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH"
@@ -367,10 +367,6 @@ write_config_mak()
 {
     # Flags to be used for C-like compilers (C, C++, Obj-C)
     local clike_flags="$VLC_DEPLOYMENT_TARGET_CFLAG -arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH $1"
-    if [ "$VLC_USE_BITCODE" -gt "0" ]; then
-        # We use bitcode for contribs in every case, no dylib or executable built from them
-        clike_flags+=" -fembed-bitcode"
-    fi
 
     local vlc_cppflags="-arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH"
     local vlc_cflags="$clike_flags"
@@ -633,6 +629,10 @@ mkdir -p "$VLC_CONTRIB_INSTALL_DIR"
 # Set flag to error on partial availability
 write_config_mak "-Werror=partial-availability"
 
+if [ "$VLC_USE_BITCODE" -gt "0" ]; then
+    VLC_CONTRIB_OPTIONS+=" --enable-bitcode"
+fi
+
 # Bootstrap contribs
 ../bootstrap \
     --host="$VLC_HOST_TRIPLET" \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a4f0a74f11cfb01182e5a42d005f045e2f6c2650...627ab4febb94291f427a5f7584d5051c64548649

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a4f0a74f11cfb01182e5a42d005f045e2f6c2650...627ab4febb94291f427a5f7584d5051c64548649
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance