[vlc-commits] [Git][videolan/vlc][master] contrib: soxr: don't force the CMAKE_SYSTEM_NAME when cross compiling

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
8adc52af by Steve Lhomme at 2024-03-28T20:37:59+00:00
contrib: soxr: don't force the CMAKE_SYSTEM_NAME when cross compiling

The proper value is already set in the toolchain.cmake since a6dcec33242e131addf60fd8f324256fc2127bb5.
If the value is not set for a cross compiled target, building fails since f2e67d22ff313ce44bd60cd534d51ff529ffda00.

- - - - -


1 changed file:

- contrib/src/soxr/rules.mak


Changes:

=====================================
contrib/src/soxr/rules.mak
=====================================
@@ -27,16 +27,7 @@ soxr: soxr-$(SOXR_VERSION)-Source.tar.xz .sum-soxr
 	$(call pkg_static,"src/soxr.pc.in")
 	$(MOVE)
 
-# CMAKE_SYSTEM_NAME is inferred from the toolchain in Android builds
-ifndef HAVE_ANDROID
-# Force CMAKE_CROSSCOMPILING to True
-ifdef HAVE_CROSS_COMPILE
-SOXR_EXTRA_CONF=-DCMAKE_SYSTEM_NAME=Generic
-endif
-endif
-
 SOXR_CONF := \
-		$(SOXR_EXTRA_CONF) \
 		-DBUILD_TESTS=OFF \
 		-DWITH_LSR_BINDINGS=OFF \
 		-DWITH_OPENMP=OFF \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/8adc52afea918c6769e29b2d5a2a1372b86743e3

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/8adc52afea918c6769e29b2d5a2a1372b86743e3
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance