Merge lp:~cjwatson/click/native-dpkg-architecture into lp:click/devel
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 458 |
Merged at revision: | 464 |
Proposed branch: | lp:~cjwatson/click/native-dpkg-architecture |
Merge into: | lp:click/devel |
Diff against target: |
92 lines (+46/-0) 3 files modified
click/chroot.py (+8/-0) click/tests/test_chroot.py (+34/-0) debian/changelog (+4/-0) |
To merge this branch: | bzr merge lp:~cjwatson/click/native-dpkg-architecture |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2014-06-10.
Commit message
Fix DEB_BUILD_* environment variables when building on amd64 for i386 (LP: #1328486).
Description of the change
When we're building on amd64 for i386 using "click chroot run", we override the native architecture to i386, but at the moment we don't fix up DEB_BUILD_* to match. That causes various problems such as cmake trying to use the wrong path to moc.
It doesn't appear to be possible to tell dpkg-architecture to use a different build architecture, short of supplying a mock "dpkg --print-
Thanks Colin, this looks fine, I just have one inline comment about the tests.