summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <Unknown>2007-09-09 22:07:18 +0000
committervorlon <Unknown>2007-09-09 22:07:18 +0000
commit6dbe8f567046b21f45a3566997f70275ddeace40 (patch)
tree878b38f37e1308c5f9edb0d835bda7a5b61b9045
parent0c03501f585338f37a5c450a4a0f3f8e0b6c48cf (diff)
Pass --build and --host args to ./configure as necessary, for cross-building
support.
-rw-r--r--changelog4
-rwxr-xr-xrules13
2 files changed, 14 insertions, 3 deletions
diff --git a/changelog b/changelog
index c57250e4..ce4d4251 100644
--- a/changelog
+++ b/changelog
@@ -31,8 +31,10 @@ pam (0.99.7.1-5) UNRELEASED; urgency=low
Closes: #440130.
* -Wl,-z,defs was never enabled correctly, drop it since upstream is
already using -no-undefined
+ * Pass --build and --host args to ./configure as necessary, for
+ cross-building support.
- -- Steve Langasek <vorlon@debian.org> Sun, 9 Sep 2007 14:19:47 -0700
+ -- Steve Langasek <vorlon@debian.org> Sun, 9 Sep 2007 14:56:22 -0700
pam (0.99.7.1-4) unstable; urgency=low
diff --git a/rules b/rules
index 8e33df7c..6efd4992 100755
--- a/rules
+++ b/rules
@@ -11,6 +11,15 @@ ifeq (,$(findstring noopt, ${DEB_BUILD_OPTIONS}))
CFLAGS += -O2
endif
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ conf_args = --build $(DEB_BUILD_GNU_TYPE)
+else
+ conf_args = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
LC_COLLATE=C
export LC_COLLATE
@@ -38,8 +47,8 @@ build-stamp:
configure: patch configure-stamp
configure-stamp:
cd $(BUILD_TREE) && \
- ./configure --sysconfdir=/etc --prefix=/usr --enable-static \
- --enable-shared \
+ ./configure $(conf_args) \
+ --sysconfdir=/etc --prefix=/usr --enable-static --enable-shared \
--mandir=/usr/share/man --infodir=/usr/share/info --libdir=/lib \
--sbindir=/sbin --enable-docdir=/usr/share/doc/libpam-doc \
--with-mailspool=/var/mail