[vlc-commits] [Git][videolan/vlc][master] 5 commits: package/apple: add sysroot to LDFLAGS

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
67705112 by Steve Lhomme at 2026-07-07T18:25:37+00:00
package/apple: add sysroot to LDFLAGS

- - - - -
79384d27 by Steve Lhomme at 2026-07-07T18:25:37+00:00
contrib: vpx: always pass the HOSTVARS

It is using the CFLAGS/LDFLAGS it is given.

- - - - -
e44c762d by Steve Lhomme at 2026-07-07T18:25:37+00:00
contrib: vpx: don't force the sysroot in LDFLAGS for iOS

It should be set in the LDFLAGS for everyone.

- - - - -
5209dfcc by Steve Lhomme at 2026-07-07T18:25:37+00:00
contrib: vpx: don't force -arm arm64 in LDFLAGS for iOS

It should be set in the LDFLAGS for everyone.

- - - - -
9d34ed99 by Steve Lhomme at 2026-07-07T18:25:37+00:00
contrib: vpx: remove unused VPX_LDFLAGS

The regular LDFLAGS are working fine.

- - - - -


2 changed files:

- contrib/src/vpx/rules.mak
- extras/package/apple/build.sh


Changes:

=====================================
contrib/src/vpx/rules.mak
=====================================
@@ -49,8 +49,6 @@ else
 VPX_CROSS :=
 endif
 
-VPX_LDFLAGS := $(LDFLAGS)
-
 ifeq ($(ARCH),arm)
 VPX_ARCH := armv7
 else ifeq ($(ARCH),i386)
@@ -139,10 +137,6 @@ ifeq ($(ARCH),arm)
 VPX_CONF += --disable-runtime-cpu-detect
 endif
 VPX_CONF += --enable-vp8-decoder
-VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) $(LDFLAGS)
-ifeq ($(ARCH),aarch64)
-VPX_LDFLAGS += -arch arm64
-endif
 endif
 ifdef HAVE_DARWIN_OS
 ifeq ($(ARCH),$(filter $(ARCH), arm aarch64))
@@ -160,12 +154,6 @@ endif
 # Always enable debug symbols, we strip in the final executables if needed
 VPX_CONF += --enable-debug
 
-ifdef HAVE_ANDROID
-# Starting NDK19, standalone toolchains are deprecated and gcc is not shipped.
-# The presence of gcc can be used to detect if we are using an old standalone
-# toolchain. Unfortunately, libvpx buildsystem only work with standalone
-# toolchains, therefore pass the HOSTVARS directly to bypass any detection.
-ifneq ($(shell $(VPX_CROSS)gcc -v >/dev/null 2>&1 || echo FAIL),)
 VPX_HOSTVARS = $(HOSTVARS)
 
 ifeq ($(filter $(ARCH),i386 x86_64),)
@@ -173,15 +161,12 @@ ifeq ($(filter $(ARCH),i386 x86_64),)
 VPX_HOSTVARS += AS="$(CCAS)"
 endif
 
-endif
-endif
-
 VPX_CONF += --extra-cflags="$(VPX_CFLAGS)"
 
 .vpx: libvpx
 	rm -rf $(PREFIX)/include/vpx
 	$(MAKEBUILDDIR)
-	cd $(BUILD_DIR) && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) $(BUILD_SRC)/configure $(VPX_CONF)
+	cd $(BUILD_DIR) && CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) $(BUILD_SRC)/configure $(VPX_CONF)
 	+CONFIG_DEBUG=1 $(MAKEBUILD)
 	$(call pkg_static,"$(BUILD_DIRUNPACK)/vpx.pc")
 	+CONFIG_DEBUG=1 $(MAKEBUILD) install


=====================================
extras/package/apple/build.sh
=====================================
@@ -388,7 +388,7 @@ set_host_envvars()
     export OBJCXXFLAGS="$clike_flags"
 
     # Vanilla clang doesn't use VLC_DEPLOYMENT_TAGET_LDFLAGS but only the CFLAGS variant
-    export LDFLAGS="$VLC_DEPLOYMENT_TARGET_LDFLAG $VLC_DEPLOYMENT_TARGET_CFLAG -arch $VLC_HOST_ARCH ${bitcode_flag}"
+    export LDFLAGS="$VLC_DEPLOYMENT_TARGET_LDFLAG $VLC_DEPLOYMENT_TARGET_CFLAG -arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH ${bitcode_flag}"
 }
 
 hostenv()
@@ -431,7 +431,7 @@ write_config_mak()
     local vlc_objcxxflags="$clike_flags"
 
     # Vanilla clang doesn't use VLC_DEPLOYMENT_TAGET_LDFLAGS but only the CFLAGS variant
-    local vlc_ldflags="\$(VLC_DEPLOYMENT_TARGET_LDFLAG) \$(VLC_DEPLOYMENT_TARGET_CFLAG) -arch $VLC_HOST_ARCH"
+    local vlc_ldflags="\$(VLC_DEPLOYMENT_TARGET_LDFLAG) \$(VLC_DEPLOYMENT_TARGET_CFLAG) -arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH"
 
     echo "Creating makefile..."
     test -e config.mak && unlink config.mak



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1729b741161ebb2876d9e9d026b933d0f65b5170...9d34ed99e2d2d2b67b98786fa5550bc964444ed2

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1729b741161ebb2876d9e9d026b933d0f65b5170...9d34ed99e2d2d2b67b98786fa5550bc964444ed2
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