Merge lp:~charlesk/indicator-location/make-gcc-version-explicit into lp:indicator-location/14.10

Proposed by Charles Kerr
Status: Merged
Approved by: Thomas Voß
Approved revision: 91
Merged at revision: 95
Proposed branch: lp:~charlesk/indicator-location/make-gcc-version-explicit
Merge into: lp:indicator-location/14.10
Diff against target: 27 lines (+7/-0)
2 files modified
debian/control (+2/-0)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-location/make-gcc-version-explicit
Reviewer Review Type Date Requested Status
Thomas Voß (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+224474@code.launchpad.net

Commit message

make the gcc version explicit in debian/control and debian/rules.

Description of the change

Make the gcc version explicit in debian/control and debian/rules to avoid ABI problems described at https://wiki.ubuntu.com/cpp-11

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Thomas Voß (thomas-voss) 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/control'
2--- debian/control 2014-05-29 06:50:05 +0000
3+++ debian/control 2014-06-25 16:04:07 +0000
4@@ -4,6 +4,8 @@
5 Maintainer: Charles Kerr <charles.kerr@canonical.com>
6 Build-Depends: cmake,
7 dbus,
8+# make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11>
9+ g++-4.9,
10 debhelper (>= 9),
11 dh-translations,
12 intltool (>= 0.35.0),
13
14=== modified file 'debian/rules'
15--- debian/rules 2013-08-26 16:58:44 +0000
16+++ debian/rules 2014-06-25 16:04:07 +0000
17@@ -1,5 +1,10 @@
18 #!/usr/bin/make -f
19
20+# Explicitly selecting a G{CC,++}-version here to avoid ABI breaks
21+# introduced by toolchain updates. <https://wiki.ubuntu.com/cpp-11>
22+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
23+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
24+
25 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
26
27 %:

Subscribers

People subscribed via source and target branches