[vlc-devel] [PATCH 3.0 08/41] contrib: qtsvg: fix qmake call when cross compiling

Steve Lhomme robux4 at ycbcr.xyz
Tue Jul 7 15:11:07 CEST 2020


It's only installed when cross compiling

(cherry picked from commit 381304e202b8b21f2ae8b81e5108288d6dd75925)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qtsvg/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 8e4381b086..4076a646ef 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -25,7 +25,11 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	$(MOVE)
 
 .qtsvg: qtsvg
+ifdef HAVE_CROSS_COMPILE
 	cd $< && $(PREFIX)/bin/qmake
+else
+	cd $< && ../qt/bin/qmake
+endif
 	# Make && Install libraries
 	cd $< && $(MAKE)
 	cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets
-- 
2.26.2



More information about the vlc-devel mailing list