Merge lp:~cjwatson/click/native-dpkg-architecture into lp:click
Status: | Superseded |
---|---|
Proposed branch: | lp:~cjwatson/click/native-dpkg-architecture |
Merge into: | lp:click |
Diff against target: |
280 lines (+212/-0) 7 files modified
click/chroot.py (+8/-0) click/tests/test_chroot.py (+24/-0) debian/changelog (+11/-0) debian/control (+1/-0) debian/tests/control (+3/-0) debian/tests/run-tests.sh (+4/-0) tests/integration/test_integration.py (+161/-0) |
To merge this branch: | bzr merge lp:~cjwatson/click/native-dpkg-architecture |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
click hackers | Pending | ||
Review via email:
|
This proposal has been superseded by 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-