Unity

Merge lp:~bregma/unity/lp-1286284 into lp:unity

  1. lp-1286284
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3692
Proposed branch: lp:~bregma/unity/lp-1286284
Merge into: lp:unity
Diff against target: 13 lines (+4/-0)
1 file modified
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~bregma/unity/lp-1286284
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+208868@code.launchpad.net

Commit message

remove -O3 and replace with -O3 for C++ compiles to prevent template-related FTBFS

Description of the change

Strip any -O3 options and force the -O2 option because -O3 causes FTBFS due to template instances getting stripped from static libraries.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3681
http://jenkins.qa.ubuntu.com/job/unity-ci/744/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/276/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/278/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/744/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

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 2014-02-25 09:59:43 +0000
3+++ debian/rules 2014-02-28 19:42:02 +0000
4@@ -9,6 +9,10 @@
5
6 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
7
8+# avoid template instance removal (lp:1286284)
9+export DEB_CXXFLAGS_MAINT_STRIP=-O3
10+export DEB_CXXFLAGS_MAINT_APPEND=-O2
11+
12 # http://ccache.samba.org/manual.html#_precompiled_headers
13 CCACHE_SLOPPINESS=time_macros
14