[libreoffice] 02/02: we need *one* dwz call for multifile, not one per package

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit ade0c90cbc69bd680fb42438df6fe25f5abb5fc1
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 3 08:09:24 2017 +0100

    we need *one* dwz call for multifile, not one per package
---
 rules | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rules b/rules
index 6841059..5279095 100755
--- a/rules
+++ b/rules
@@ -202,7 +202,7 @@ BUILD_DBGSYM_PACKAGES=y
 ifeq "$(DEB_HOST_ARCH)" "amd64"
 USE_DWZ=y
 DWZ_ARGS:=-L 100000000
-USE_DWZ_MULTIFILE=y
+USE_DWZ_MULTIFILE=n
 endif
 endif
 SYSTEM_STUFF += xmlsec
@@ -3205,8 +3205,14 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	rm -rf debian/$(UNO_LIBS_DBG_ROOT) debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) \
 		debian/$(WRITER_DBG_ROOT)
   ifeq "$(USE_DWZ)" "y"
+    ifeq "$(USE_DWZ_MULTIFILE)" "y"
 	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz
+	# dh_dwz goes over each package. and -m overwrites the file. so we only
+	# get the base-core one... Run dwz manually on what dh_dwz would do.
+	dwz $(DWZ_ARGS) `dh_dwz -a -v --no-act | sed -e "s,^.*dwz -q -- ,," | xargs`
+    else
 	dh_dwz -a -- $(DWZ_ARGS)
+    endif
   endif
 	dh_strip -a -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)
 	dh_strip -pure $(DH_STRIP_DBG_OPTION_URE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git