[libreoffice] 01/02: make dwz multilib stuff work

[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 f5375812118d9f2aef82e21b99f144cb1585122d
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 31 16:14:08 2017 +0100

    make dwz multilib stuff work
---
 rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rules b/rules
index ed0838e..9b910c6 100755
--- a/rules
+++ b/rules
@@ -202,10 +202,7 @@ BUILD_DBGSYM_PACKAGES=y
 ifeq "$(DEB_HOST_ARCH)" "amd64"
 USE_DWZ=y
 DWZ_ARGS:=-L 100000000
-USE_DWZ_MULTIFILE=n
-ifeq "$(USE_DWZ_MULTIFILE)" "y"
-DWZ_ARGS += -m $(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH)
-endif
+USE_DWZ_MULTIFILE=y
 endif
 endif
 SYSTEM_STUFF += xmlsec
@@ -719,6 +716,11 @@ DH_STRIP_DBG_OPTION_URE += --no-automatic-dbgsym
 DH_STRIP_DBG_OPTION_UNO_LIBS3 += --no-automatic-dbgsym
 endif
 
+ifeq "$(USE_DWZ_MULTIFILE)" "y"
+DWZ_ARGS += -m debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz/$(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH) \
+	-M /usr/lib/debug/.dwz/$(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH)
+endif
+
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
 
 CC_PREFIX:=$(shell gcc -dumpmachine)-
@@ -1601,9 +1603,6 @@ clean-debdir:
 	rm -f debian/*.install debian/*.dirs debian/*.changelog
 	rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
 	rm -f debian/pom*.xml
-ifeq "$(USE_DWZ_MULTIFILE)" "y"
-	rm -f $(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH)
-endif
 
 	rm -rf $(CURDIR)/debian/locales
 
@@ -3209,8 +3208,10 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 	dh_bugfiles -a -A
 	dh_link -a
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
-	rm -rf debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) debian/$(WRITER_DBG_ROOT)
+	rm -rf debian/$(UNO_LIBS_DBG_ROOT) debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) \
+		debian/$(WRITER_DBG_ROOT)
   ifeq "$(USE_DWZ)" "y"
+	mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz
 	dh_dwz -a -- $(DWZ_ARGS)
   endif
 	dh_strip -a -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)

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