[Pkg-zsh-commits] [zsh] 03/05: Fix binary-indep/install-indep build and optimize its dependencies

[Axel Beckert]

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

abe pushed a commit to branch min-dh-oot
in repository zsh.

commit fd3672873e01cea3c2c8952828caba44686fe981
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Nov 12 07:03:37 2017 +0100

    Fix binary-indep/install-indep build and optimize its dependencies
    
    Gbp-Dch: Ignore
---
 debian/rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7dd64ef..efe0651 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,10 @@ BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), '
 %:
 	dh $@
 
-override_dh_auto_build-arch:
+override_dh_auto_build-arch: build-dynamic build-static
+build-dynamic:
 	dh_auto_build -B obj
+build-static:
 	dh_auto_build -B obj-static
 
 override_dh_auto_build-indep:
@@ -85,20 +87,19 @@ override_dh_installdocs-indep:
 	dh_installdocs -pzsh-doc --link-doc=zsh-common --doc-main-package=zsh-common
 	dh_installdocs -pzsh-common
 
-override_dh_auto_install-indep:
+# Needs a freshly built (arch-dependent) zsh executable to compile .zwc files
+override_dh_auto_install-indep: build-dynamic
 	cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh-common
 	perl $(CURDIR)/Util/helpfiles Doc/zshbuiltins.1 debian/zsh-common/usr/share/zsh/help
 
 	cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/zsh-common
 	rm -r debian/zsh-common/usr/local
 
-# move this to a non-root section; also drop it for cross-compiles
 	awk '/^#define FPATH_DIR/     { head=$$3;       gsub(/"/,"",head); };        \
              /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } \
              END                      { printf "%s/%s\n", head, tail; };'            \
 	    obj/Src/zshpaths.h >obj/Src/zshpaths.temp
-# TODO: This will likely not work if only arch-indep packages are built
-	debian/zsh/bin/zsh -fc \
+	obj/Src/zsh -fc \
             'setopt extendedglob; \
 	     for i in debian/zsh-common/'`cat obj/Src/zshpaths.temp`'; do \
 		 zcompile -U -M $$i.zwc $$i/*~*.zwc(^/);                  \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git