[Pkg-openldap-devel] [openldap] 05/05: Pass CC to make explicitly for contrib

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit f87474b41f5991b70836de5b65761edf76470a45
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat Nov 26 22:04:21 2016 +0000

    Pass CC to make explicitly for contrib
---
 debian/changelog | 4 ++++
 debian/rules     | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f6625a..0c2d57c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 openldap (2.4.44+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Ryan Tandy ]
   * Update Standards-Version to 3.9.8; no changes required.
   * Enable dh_makeshlibs for libldap-2.4-2. Remove libldap-2.4-2.postinst, now 
     replaced by the automatic ldconfig trigger.
   * Don't execute slapd's override_dh_install when building only 
     arch-independent packages. (Closes: #845506)
 
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Pass CC to make explicitly. (Closes: #839251)
+
  -- Ryan Tandy <ryan at nardis.ca>  Fri, 18 Nov 2016 06:00:35 +0000
 
 openldap (2.4.44+dfsg-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 421cbad..cc9dbc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,10 +102,10 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	dh_auto_build -- $(MAKEVARS)
 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
-	$(MAKE) -C contrib/slapd-modules/smbk5pwd
-	$(MAKE) -C contrib/slapd-modules/autogroup
-	$(MAKE) -C contrib/slapd-modules/lastbind
-	$(MAKE) -C contrib/slapd-modules/passwd/sha2
+	$(MAKE) -C contrib/slapd-modules/smbk5pwd CC=$(CC)
+	$(MAKE) -C contrib/slapd-modules/autogroup CC=$(CC)
+	$(MAKE) -C contrib/slapd-modules/lastbind CC=$(CC)
+	$(MAKE) -C contrib/slapd-modules/passwd/sha2 CC=$(CC)
 endif
 
 override_dh_auto_install:

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