Autopilot Qt Support

Merge lp:~thomir-deactivatedaccount/autopilot-qt/trunk-add-build-flags into lp:autopilot-qt

  1. trunk-add-build-flags
  2. Merge into trunk
Proposed by Thomi Richards
Status: Merged
Approved by: Christopher Lee
Approved revision: 85
Merged at revision: 88
Proposed branch: lp:~thomir-deactivatedaccount/autopilot-qt/trunk-add-build-flags
Merge into: lp:autopilot-qt
Diff against target: 20 lines (+8/-2)
1 file modified
debian/rules (+8/-2)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot-qt/trunk-add-build-flags
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Christopher Lee (community) Approve
Review via email: mp+228218@code.launchpad.net

Commit message

Make debian package builds respect dpkg-buildflag values.

Description of the change

Make debian package builds respect dpkg-buildflag values.

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-qt-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-qt-ci/25/rebuild

review: Approve (continuous-integration)
Revision history for this message
Colin Watson (cjwatson) wrote :

Technically QMAKE_CXXFLAGS should be set using 'dpkg-buildflags --get CXXFLAGS' rather than 'dpkg-buildflags --get CFLAGS'. The defaults are the same, so this isn't critical, but it would confuse somebody trying to adjust them by hand.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2013-03-19 12:13:11 +0000
3+++ debian/rules 2014-07-24 22:19:15 +0000
4@@ -8,8 +8,14 @@
5 override_dh_auto_configure:
6 mkdir qt4
7 mkdir qt5
8- cd qt4 && qmake -qt=qt4 ../autopilot-qt.pro
9- cd qt5 && qmake -qt=qt5 ../autopilot-qt.pro
10+ cd qt4 && \
11+ qmake -qt=qt4 QMAKE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
12+ QMAKE_CXXFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
13+ QMAKE_LFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ../autopilot-qt.pro
14+ cd qt5 && \
15+ qmake -qt=qt5 QMAKE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
16+ QMAKE_CXXFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
17+ QMAKE_LFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ../autopilot-qt.pro
18
19 override_dh_auto_build:
20 cd qt4 && make

Subscribers

People subscribed via source and target branches

to all changes: