[vlc-devel] [PATCH 3/3] contrib: qt: build less things

[Alexandre Janniaux]

Hi,

Small typo:
- disabke instead of disable

Apart from that maybe target could be written vertically
instead of putting them on the same line.

Are you sure the no-shared is needed? -static shouldn't
already disable the building of shared versions?

Regards,
--
Alexandre Janniaux
Videolabs

On Mon, Mar 09, 2020 at 02:10:39PM +0100, Steve Lhomme wrote:
> - 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 disabke SQL support
> ---
>  contrib/src/qt/rules.mak | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
> index 11fefca26b5..65937d7bc16 100644
> --- a/contrib/src/qt/rules.mak
> +++ b/contrib/src/qt/rules.mak
> @@ -79,11 +79,13 @@ 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-zlib
> +	-no-compile-examples -nomake examples -nomake tests
>
> +QT_CONFIG += -skip qtsql
> +QT_CONFIG += -skip qttest
>  QT_CONFIG += -release
>
>  ifeq ($(V),1)
> @@ -102,7 +104,7 @@ ENV_VARS := $(HOSTVARS) DXSDK_DIR=$(PREFIX)/bin
>  	+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 sub-network-install_subtargets sub-testlib-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.17.1
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel