[Pkg-cracklib-commits] [pkg-cracklib] 05/06: Fix "FTCBFS: invokes host-arch executable cracklib-packer" by applying Helmut Grohne's patch to fix cross compilation (Closes: #792860)

[Jan Dittberner]

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

jandd pushed a commit to branch master
in repository pkg-cracklib.

commit 36022e1da091b321d65cd0b92d857c0f76c6d9e1
Author: Jan Dittberner <jandd at debian.org>
Date:   Thu Aug 25 17:24:10 2016 +0200

    Fix "FTCBFS: invokes host-arch executable cracklib-packer" by applying Helmut Grohne's patch to fix cross compilation (Closes: #792860)
---
 debian/changelog |  2 ++
 debian/control   |  1 +
 debian/rules     | 10 ++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e518b0d..3f2127f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ cracklib2 (2.9.2-3) UNRELEASED; urgency=medium
   * remove obsolete debian/pycompat
   * change Vcs-* fields to https variants
   * Bump Standards-Version to 3.9.8 (no changes)
+  * Fix "FTCBFS: invokes host-arch executable cracklib-packer" by applying
+    Helmut Grohne's patch to fix cross compilation (Closes: #792860)
 
  -- Jan Dittberner <jandd at debian.org>  Thu, 25 Aug 2016 17:03:01 +0200
 
diff --git a/debian/control b/debian/control
index 6178650..400a756 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: autoconf (>=2.61),
                automake (>= 1.10),
                autotools-dev,
                chrpath,
+               cracklib-runtime:native <cross>,
                debhelper (>= 9),
                docbook-utils,
                docbook-xml,
diff --git a/debian/rules b/debian/rules
index 8683e91..5cb9955 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,12 @@ else
 NOPYTHON_OPTIONS = -Npython-cracklib -Npython3-cracklib
 endif
 
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CRACKLIB_PACKER=$(CURDIR)/debian/buildtmp/base/util/cracklib-packer
+else
+CRACKLIB_PACKER=/usr/sbin/cracklib-packer
+endif
+
 override_dh_auto_configure:
 	aclocal && libtoolize && automake --add-missing && autoreconf
 	mkdir -p $(CURDIR)/debian/buildtmp/base
@@ -57,7 +63,7 @@ endif
 override_dh_auto_test:
 	mkdir $(CURDIR)/debian/tmp
 ifneq ($(DEB_STAGE),stage1)
-	$(CURDIR)/debian/buildtmp/base/util/cracklib-packer $(CURDIR)/debian/tmp/cracklib_dict < \
+	$(CRACKLIB_PACKER) $(CURDIR)/debian/tmp/cracklib_dict < \
 	 $(CURDIR)/dicts/cracklib-small
 	for i in $(PYVERS) $(PY3VERS); do \
 		cd $(CURDIR)/debian/buildtmp/python$$i/python/$(call py_builddir_sh,$$i); \
@@ -91,7 +97,7 @@ override_dh_auto_install:
 	      $(CURDIR)/debian/libcrack2-udeb/usr/lib/$(DEB_HOST_MULTIARCH)
 	cp -r $(CURDIR)/debian/libcrack2/usr/share/locale/* \
 	      $(CURDIR)/debian/libcrack2-udeb/usr/share/locale
-	$(CURDIR)/debian/buildtmp/base/util/cracklib-packer $(CURDIR)/debian/libcrack2-udeb/var/cache/cracklib/cracklib_dict < \
+	$(CRACKLIB_PACKER) $(CURDIR)/debian/libcrack2-udeb/var/cache/cracklib/cracklib_dict < \
 	    $(CURDIR)/dicts/cracklib-small
 	# move files to libcrack2-dev
 	mkdir -p $(CURDIR)/debian/libcrack2-dev/usr/lib/$(DEB_HOST_MULTIARCH)

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