[vlc-devel] [PATCH 3.0 36/41] contribs: qt: prevent Qt from creating libtool files

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


From: Alexandre Janniaux <ajanni at videolabs.io>

These files are generated but never used by Qt. They prevent libtool in
VLC from using pkg-config files, which would lead to misconfiguration issues,
especially in cross-compilation build.

The create_libtool config option is currently only set for unix builds, but
setting -create_libtool in the .prf file will prevent every other qt contribs to
generate libtool files too.

Signed-off-by: Marvin Scholz <epirat07 at gmail.com>
(cherry picked from commit a08ff7f1d7f8f1a2e985b5d6cf3853b7dd299c9d) (rebased)

rebased:
- this branch doesn't have DXSDK_DIR

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

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index c2d5741b5c..82a07f36d2 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -39,7 +39,6 @@ endif
 
 endif
 	$(APPLY) $(SRC)/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
-	
 	$(APPLY) $(SRC)/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
 	$(APPLY) $(SRC)/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
 	$(MOVE)
@@ -84,6 +83,8 @@ endif
 ENV_VARS := $(HOSTVARS)
 
 .qt: qt
+	# Prevent all Qt contribs from generating and installing libtool .la files
+	cd $< && sed -i "/CONFIG/ s/ create_libtool/ -create_libtool/g" mkspecs/features/qt_module.prf
 	+cd $< && $(ENV_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX) -I $(PREFIX)/include
 	# Make && Install libraries
 	cd $< && $(ENV_VARS) $(MAKE)
-- 
2.26.2



More information about the vlc-devel mailing list