Unity API

Merge lp:~robru/unity-api/require-g++-4.9 into lp:unity-api

  1. require-g++-4.9
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Superseded
Proposed branch: lp:~robru/unity-api/require-g++-4.9
Merge into: lp:unity-api
Diff against target: 63 lines (+20/-1)
4 files modified
CMakeLists.txt (+9/-0)
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~robru/unity-api/require-g++-4.9
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+226559@code.launchpad.net

This proposal has been superseded by a proposal from 2014-07-18.

Commit message

Require g++4.9 for build to avoid ABI breakage since 4.8.

Description of the change

Require g++4.9 for build to avoid ABI breakage since 4.8.

Note, I just resolved the merge conflicts. The work in this branch came from https://code.launchpad.net/~michihenning/unity-api/require-g++-4.9/+merge/225100

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

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/unity-api-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/68

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

review: Approve (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-07-03 08:21:19 +0000
3+++ CMakeLists.txt 2014-07-12 00:25:51 +0000
4@@ -15,6 +15,15 @@
5
6 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
7
8+# We require g++ 4.9, to avoid ABI breakage with earlier version.
9+# Note that this must match what is specifed in debian/control.
10+set(cxx_version_required 4.9)
11+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
12+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${cxx_version_required})
13+ message(FATAL_ERROR "g++ version must be ${cxx_version_required}!")
14+ endif()
15+endif()
16+
17 include(PrecompiledHeaders)
18 include(EnableCoverageReport)
19 #####################################################################
20
21=== modified file 'debian/changelog'
22--- debian/changelog 2014-07-08 15:06:25 +0000
23+++ debian/changelog 2014-07-12 00:25:51 +0000
24@@ -19,6 +19,12 @@
25
26 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 02 Jul 2014 15:17:16 +0000
27
28+unity-api (7.83+14.10.20140626-0ubuntu2) UNRELEASED; urgency=medium
29+
30+ * Explicitly select g++-4.9 to prevent ABI breakage.
31+
32+ -- Michi Henning <michi.henning@canonical.com> Tue, 01 Jul 2014 17:53:40 +1000
33+
34 unity-api (7.83+14.10.20140626-0ubuntu1) utopic; urgency=medium
35
36 [ Michal Hruby ]
37
38=== modified file 'debian/control'
39--- debian/control 2013-07-02 10:47:19 +0000
40+++ debian/control 2014-07-12 00:25:51 +0000
41@@ -2,7 +2,8 @@
42 Priority: optional
43 Section: libs
44 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45-Build-Depends: debhelper (>= 9),
46+Build-Depends: g++-4.9,
47+ debhelper (>= 9),
48 cmake,
49 doxygen,
50 graphviz,
51
52=== modified file 'debian/rules'
53--- debian/rules 2014-07-02 15:16:19 +0000
54+++ debian/rules 2014-07-12 00:25:51 +0000
55@@ -5,6 +5,9 @@
56 #export DH_VERBOSE=1
57 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
58
59+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
60+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
61+
62 # http://ccache.samba.org/manual.html#_precompiled_headers
63 export CCACHE_SLOPPINESS=time_macros
64

Subscribers

People subscribed via source and target branches

to all changes: