[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: package/macosx: show the SDK version used to build
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri Sep 11 09:19:59 UTC 2026
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
d76b24f4 by Steve Lhomme at 2026-09-11T07:31:17+00:00
package/macosx: show the SDK version used to build
- - - - -
129e626d by Steve Lhomme at 2026-09-11T07:31:17+00:00
CI: omit the VLC_SDK_PATH when it's the default location for XCode
It was probably set only because the -k option required a value and using
-k was required to select XCode 9.2.
- - - - -
bcaeca12 by Felix Paul Kühne at 2026-09-11T07:31:17+00:00
build/anyAppleOS: disable C23 to keep libtool ObjC tag inference working
autoconf 2.73 adds -std=gnu23 to CC but not OBJC, so libtool can no
longer infer the tag for .m compiles and aborts.
This disables c23 to workaround until the full objc language support is
added to libtool, which is well under way.
(cherry picked from commit 5d30bfaf6a943ed3db7af944604b892bf69d5c1e) (rebased)
rebased:
- VLC 3 has more ac_cv_func_XXX overriding around
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
3 changed files:
- extras/ci/gitlab-ci.yml
- extras/package/macosx/build.sh
- extras/package/macosx/env.build.sh
Changes:
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -53,7 +53,6 @@ variables:
.variables-macos-x86_64: &variables-macos-x86_64
VLC_PATH: /Users/videolanci/sandbox/bin
VLC_FORCE_KERNELVERSION: 18
- VLC_SDK_PATH: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
HOST_ARCH: x86_64
SHORTARCH: intel64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
@@ -61,7 +60,6 @@ variables:
.variables-macos-arm64: &variables-macos-arm64
VLC_PATH: /Users/videolanci/sandbox/bin
VLC_FORCE_KERNELVERSION: 19
- VLC_SDK_PATH: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
HOST_ARCH: aarch64
SHORTARCH: arm64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
@@ -520,7 +518,7 @@ release-snap:
fi
export PATH="${VLC_PATH}:$PATH"
mkdir build && cd build
- ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -a $HOST_ARCH -k $VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS
+ ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -a $HOST_ARCH $NIGHTLY_EXTRA_BUILD_FLAGS
macos-x86_64:
extends: .macos-common
=====================================
extras/package/macosx/build.sh
=====================================
@@ -163,6 +163,12 @@ export STRIP="`xcrun --find strip`"
export SDKROOT
export PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${BUILD_TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
+SDK_VERSION="$(xcrun --show-sdk-version)"
+XCODE_VERSION="$(xcodebuild -version)"
+
+info "Building with minimum macOS version $MINIMAL_OSX_VERSION and SDK $SDK_VERSION at $SDKROOT using $XCODE_VERSION"
+
+
# Select avcodec flavor to compile contribs with
export USE_FFMPEG=1
=====================================
extras/package/macosx/env.build.sh
=====================================
@@ -116,6 +116,9 @@ vlcSetSymbolEnvironment() {
# - Added symbols in macOS 10.13 / iOS 11 / watchOS 4 / tvOS 11
# - Added symbol in macOS 10.14 / iOS 12 / tvOS 9
# - Added symbols in macOS 10.15 / iOS 13 / tvOS 13
+ #
+ # ac_cv_prog_cc_c23: autoconf 2.73 adds -std=gnu23 to CC but not OBJC
+ # breaking libtool's ObjC tag inference.
"${cmd}" "$@" \
ac_cv_lib_network_connect=no \
\
@@ -130,6 +133,8 @@ vlcSetSymbolEnvironment() {
ac_cv_func_linkat=no \
ac_cv_func_unlinkat=no \
\
+ ac_cv_prog_cc_c23=no \
+ \
ac_cv_func_basename_r=no \
ac_cv_func_clock_getres=no \
ac_cv_func_clock_gettime=no \
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/479f8848770bab06da690d84c502945f1794c418...bcaeca1281c4c6f5990a8d7120b9c79422f537d8
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/479f8848770bab06da690d84c502945f1794c418...bcaeca1281c4c6f5990a8d7120b9c79422f537d8
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list