[vlc-devel] [PATCH 3.0 39/41] contrib: qt: build less things

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


- we can use whatever zlib is available
- we don't need to build the test framework
- make sure we don't build the shared version
- attempt to disable SQL support

(cherry picked from commit 4f72f199f20530803227ca09478d6004a0bb9703) (edited)

edited:
- this branch doesn't build OpenGL
- this branch didn't use qt-zlib (yet)
- this branch builds less targets (missing sub-network-install_subtargets sub-testlib-install_subtargets)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qt/rules.mak | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 3d7ff70a88..6659a41247 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -62,11 +62,13 @@ endif
 endif
 endif
 
-QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
+QT_CONFIG := -static -no-shared -opensource -confirm-license -no-pkg-config \
 	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl $(QT_OPENGL) -no-dbus \
 	-no-vulkan -no-sql-odbc -no-pch \
 	-no-compile-examples -nomake examples -nomake tests
 
+QT_CONFIG += -skip qtsql
+QT_CONFIG += -skip qttest
 QT_CONFIG += -release
 
 ifeq ($(V),1)
@@ -85,7 +87,7 @@ ENV_VARS := $(HOSTVARS)
 	+cd $< && $(ENV_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX) -I $(PREFIX)/include
 	# Make && Install libraries
 	cd $< && $(ENV_VARS) $(MAKE)
-	cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets
+	cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-bootstrap-install_subtargets sub-network-install_subtargets
 	# Install tools
 	cd $< && $(MAKE) -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets sub-qlalr-install_subtargets
 	# Install plugins
-- 
2.26.2



More information about the vlc-devel mailing list