[apache2] 02/03: Merge cross-compile tweaks for debian/rules from ubuntu

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit 910de41ad941886060520d60def9400b76535148
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 27 10:19:44 2016 +0200

    Merge cross-compile tweaks for debian/rules from ubuntu
---
 debian/changelog | 1 +
 debian/rules     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dceec89..a463ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ apache2 (2.4.18-2) UNRELEASED; urgency=medium
   * Give a hint about systemd in README.multiple-instances. Closes: #818904
   * Don't treat mod_access_compat as essential. It's essentially broken,
     anyway.
+  * Merge cross-compile tweaks for debian/rules from ubuntu.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 09 Jan 2016 23:35:20 +0100
 
diff --git a/debian/rules b/debian/rules
index 451c169..85b9eab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,8 @@ AP2_CFLAGS = -pipe $(CFLAGS)
 AP2_LDFLAGS = -Wl,--as-needed $(LDFLAGS)
 AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' -DBUILD_DATETIME='\"$(BUILD_DATETIME)\"' $(CPPFLAGS)
 AP2_LTFLAGS = --no-silent
-
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 support/suexec-custom.c: support/suexec.c debian/patches/suexec-custom.patch
 	cp support/suexec.c support/suexec-custom.c
@@ -68,7 +69,8 @@ clean build build-arch build-indep binary binary-arch binary-indep: %:
 	dh $@ --parallel --with autotools_dev
 
 override_dh_auto_configure: generate-maintainer-scripts prebuild-checks support/suexec-custom.c
-	./configure --enable-layout=Debian --enable-so --with-program-name=apache2 \
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--enable-layout=Debian --enable-so --with-program-name=apache2 \
 		--enable-suexec --with-suexec-caller=www-data \
 		--with-suexec-bin=/usr/lib/apache2/suexec --with-suexec-docroot=/var/www \
 		--with-suexec-userdir=public_html --with-suexec-logfile=/var/log/apache2/suexec.log \

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