[vlc-commits] [Git][videolan/vlc][master] 3 commits: Revert "contrib: qt: don't patch create_libtool value"

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
dc62481c by Johannes Kauffmann at 2022-12-04T17:17:36+00:00
Revert "contrib: qt: don't patch create_libtool value"

This reverts commit cee6cee6aacd9ac186e91c9fbfa2e7c8e9fc6033.

Unfortunately, removing create_libtool from CONFIG in the toolchain file
gets overridden when it is added to CONFIG again in qt_module.prf.

Qt itself adds it to CONFIG for "!lib_bundle:unix", indeed in the
Windows contrib archive, libQt5Bootstrap.la can be spotted (as this is
for the native build only). Also, when building for Debian, all Qt
modules will install .la files, like libQt5Core.la.

As qt_module.prf is the only place in the whole of Qt where this is
added to CONFIG, it should be sufficient to patch it here.

- - - - -
6ddfe298 by Johannes Kauffmann at 2022-12-04T17:17:36+00:00
contrib: qt: remove create_libtool from toolchain

As explained by the previous commit, this does not have any effect.

- - - - -
30815c4f by Johannes Kauffmann at 2022-12-04T17:17:36+00:00
contrib: qt: move sed patch to src prepare stage

Like the other sed patches, this belongs here.

- - - - -


1 changed file:

- contrib/src/qt/rules.mak


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -61,6 +61,8 @@ endif
 	sed -i.orig 's#"-lharfbuzz"#{ "libs": "-framework CoreText -framework CoreGraphics -framework CoreFoundation -lharfbuzz", "condition": "config.darwin" }, "-lharfbuzz"#' "$(UNPACK_DIR)/src/gui/configure.json"
 	# Let us decide the WINVER/_WIN32_WINNT
 	sed -i.orig 's,mingw: DEFINES += WINVER=0x0601,# mingw: DEFINES += WINVER=0x0601,' "$(UNPACK_DIR)/mkspecs/features/qt_build_config.prf"
+	# Prevent all Qt contribs from generating and installing libtool .la files
+	sed -i.orig "/CONFIG/ s/ create_libtool/ -create_libtool/g" $(UNPACK_DIR)/mkspecs/features/qt_module.prf
 	$(MOVE)
 
 
@@ -134,7 +136,7 @@ qmake_toolchain = echo "!host_build {"    > $(1)/.qmake.cache && \
 	echo "  QMAKE_CXXFLAGS += $(BUILDCXXFLAGS)" >> $(1)/.qmake.cache && \
 	echo "  QMAKE_LFLAGS   += $(BUILDLDFLAGS)"  >> $(1)/.qmake.cache && \
 	echo "}"                                           >> $(1)/.qmake.cache && \
-	echo "CONFIG -= create_libtool debug_and_release" >> $(1)/.qmake.cache && \
+	echo "CONFIG -= debug_and_release" >> $(1)/.qmake.cache && \
 	echo "CONFIG += object_parallel_to_source create_pc force_bootstrap" >> $(1)/.qmake.cache
 
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/06feaa77c3ab379c563e474859e2419f870dad94...30815c4f7c6418373cf967f842ff9003e0d3193e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/06feaa77c3ab379c563e474859e2419f870dad94...30815c4f7c6418373cf967f842ff9003e0d3193e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance