Merge lp:~peter-pearse/ubuntu/natty/acl/prop002 into lp:ubuntu/natty/acl

Proposed by Peter Pearse
Status: Merged
Merged at revision: 18
Proposed branch: lp:~peter-pearse/ubuntu/natty/acl/prop002
Merge into: lp:ubuntu/natty/acl
Diff against target: 42 lines (+16/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+10/-1)
To merge this branch: bzr merge lp:~peter-pearse/ubuntu/natty/acl/prop002
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+50784@code.launchpad.net

Description of the change

Pass --host & --build for cross builds.
ONLY to cross builds as per comment from Steve Langasek

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-28 22:15:20 +0000
3+++ debian/changelog 2011-02-22 17:05:03 +0000
4@@ -1,3 +1,9 @@
5+acl (2.2.49-4ubuntu1) natty; urgency=low
6+
7+ * Pass host & build to allow cross builds to succeed
8+
9+ -- Peter Pearse <peter.pearse@linaro.org> Fri, 28 Jan 2011 17:11:25 +0000
10+
11 acl (2.2.49-4) unstable; urgency=low
12
13 * Migrate to having binaries in sbindir (closes: #590240)
14
15=== modified file 'debian/rules'
16--- debian/rules 2010-02-02 11:40:55 +0000
17+++ debian/rules 2011-02-22 17:05:03 +0000
18@@ -18,6 +18,15 @@
19 INSTALL_USER=root INSTALL_GROUP=root ;
20 checkdir = test -f debian/rules
21
22+# Ensure cross builds succeed
23+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
24+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
25+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
26+ LOCAL_CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE)
27+else
28+ LOCAL_CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
29+endif
30+
31 build: built
32 built: config
33 @echo "== dpkg-buildpackage: build" 1>&2
34@@ -29,7 +38,7 @@
35 .census:
36 @echo "== dpkg-buildpackage: configure" 1>&2
37 $(checkdir)
38- $(options) $(MAKE) configure
39+ $(options) $(MAKE) configure LOCAL_CONFIGURE_OPTIONS="$(LOCAL_CONFIGURE_OPTIONS)"
40 touch .census
41
42 clean:

Subscribers

People subscribed via source and target branches

to all changes: