[neon/qt/qtcreator/Neon/release] debian: try to tweak dwz processing on some archs

Pino Toscano null at kde.org
Mon Jan 16 22:09:47 GMT 2023


Git commit cee828d7f062406bb6af0eb9e63f67202050a7df by Pino Toscano.
Committed on 08/07/2022 at 05:03.
Pushed by carlosdem into branch 'Neon/release'.

try to tweak dwz processing on some archs

M  +4    -0    debian/changelog
M  +13   -0    debian/rules

https://invent.kde.org/neon/qt/qtcreator/commit/cee828d7f062406bb6af0eb9e63f67202050a7df

diff --git a/debian/changelog b/debian/changelog
index 630ecd6..5f42dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtcreator (8.0.0~rc1-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Pass --low-mem-die-limit 5000000 to dwz on some architectures (currently:
+    armel armhf mipsel), as an attempt to complete the dwz processing without
+    running into "out of memory" failures.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jul 2022 06:51:12 +0200
 
diff --git a/debian/rules b/debian/rules
index 91ba61c..9077b65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,14 @@ export QTC_BUILD_PLUGIN_HELLOWORLD=FALSE
 # The upstream version of a package passed as parameter
 upstream_version_of_pkg = $(shell dpkg-query -f '$${Version}' -W $(1) | sed -e 's/-[^-]*$$//')
 
+# the dwz processing for all the libraries and plugins can take a lot of memory,
+# which may be not enough on some architectures (typically 32bit), resulting in
+# dwz failing with "Could not allocate memory: Cannot allocate memory" errors;
+# hence, on architectures where we see this result, try to use a more memory
+# friendly processing for a lower number of DIEs (dwz default is 10M)
+archs_with_dwz_low_mem = armel armhf mipsel
+dwz_low_mem = 5000000
+
 %:
 	dh $@ --builddirectory=builddir
 
@@ -52,3 +60,8 @@ override_dh_shlibdeps:
 	echo 'libQt6DesignerComponents 6 libqt6designercomponents6 (>= $(call upstream_version_of_pkg,libqt6designercomponents6)~)' > debian/shlibs.local
 	dh_shlibdeps -l$(CURDIR)/debian/qtcreator/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator
 	rm debian/shlibs.local
+
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_with_dwz_low_mem)))
+override_dh_dwz:
+	dh_dwz -- --low-mem-die-limit $(dwz_low_mem)
+endif



More information about the Neon-commits mailing list