[vlc-commits] [Git][videolan/vlc][master] contrib: qt: add the prefix path when building with CMake

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
c60be60d by Steve Lhomme at 2024-07-31T13:59:35+00:00
contrib: qt: add the prefix path when building with CMake

The PATH set in HOSTVARS_CMAKE is not kept when calling CMAKEBUILD.
We need that path to have access to the "cross compiled" fxc2.

- - - - -


4 changed files:

- contrib/src/qt/rules.mak
- contrib/src/qt5compat/rules.mak
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtsvg/rules.mak


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -108,6 +108,6 @@ QTBASE_NATIVE_CONFIG := $(QTBASE_COMMON_CONFIG) -DQT_BUILD_TESTS=FALSE \
 .qt: qt toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE) $(QTBASE_CONFIG)
-	+$(CMAKEBUILD)
+	+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
 	$(CMAKEINSTALL)
 	touch $@


=====================================
contrib/src/qt5compat/rules.mak
=====================================
@@ -34,6 +34,6 @@ qt5compat: qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz .sum-qt5compat
 .qt5compat: qt5compat toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE) $(QT5_COMPAT_CONFIG)
-	+$(CMAKEBUILD)
+	+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
 	$(CMAKEINSTALL)
 	touch $@


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -102,6 +102,6 @@ QT_DECLARATIVE_NATIVE_CONFIG := $(QT_DECLARATIVE_COMMON_CONFIG) \
 .qtdeclarative: qtdeclarative toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE) $(QT_DECLARATIVE_CONFIG)
-	+$(CMAKEBUILD)
+	+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
 	$(CMAKEINSTALL)
 	touch $@


=====================================
contrib/src/qtsvg/rules.mak
=====================================
@@ -32,6 +32,6 @@ qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 .qtsvg: qtsvg toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE) $(QTSVG_CONFIG)
-	+$(CMAKEBUILD)
+	+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
 	$(CMAKEINSTALL)
 	touch $@



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

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


VideoLAN code repository instance