vlc | branch: master | Alexandre Janniaux <[email protected]> | Fri Nov 15 14:54:25 2019 +0100| [a08ff7f1d7f8f1a2e985b5d6cf3853b7dd299c9d] | committer: Marvin Scholz
contribs: qt: prevent Qt from creating libtool files 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 <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a08ff7f1d7f8f1a2e985b5d6cf3853b7dd299c9d --- 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 a1c1c4ad25..126f7a5a6d 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -49,7 +49,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) @@ -101,6 +100,8 @@ endif ENV_VARS := $(HOSTVARS) DXSDK_DIR=$(PREFIX)/bin .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) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
