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

[Michi Henning]

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity-api-ci/218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/53/console

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

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Not sure why this falls over on Jenkins. The build definitely installs 4.9 but, when cmake runs, it detects 4.8. Anyone know why this is happening?

dh_auto_configure -- -DCMAKE_BUILD_TYPE=coverage
-- The C compiler identification is GNU 4.8.3
-- The CXX compiler identification is GNU 4.8.3
-- Check for working C compiler: /usr/bin/x86_64-linux-gnu-gcc
-- Check for working C compiler: /usr/bin/x86_64-linux-gnu-gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/x86_64-linux-gnu-g++
-- Check for working CXX compiler: /usr/bin/x86_64-linux-gnu-g++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
CMake Error at CMakeLists.txt:23 (message):
  g++ version must be 4.9!

[Jussi Pakkanen (jpakkane)]

You need to set this at the top of debian/rules:

# Explicitly selecting a G{CC,++}-version here to avoid accidental
# ABI breaks introduced by toolchain updates.
include /usr/share/dpkg/default.mk
export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9

(It is the -D flags to CMake that were unnecessary.)

[lp:~michihenning/unity-api/require-g++-4.9]

143. By Michi Henning on 2014-07-01

Set environment variables after all. (I mis-read Jussi's comments.)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

> (It is the -D flags to CMake that were unnecessary.)

Yes, I realised that after the stand-up. I mis-read your original comments on Thomas's MR.
Jenkins just OK'd it with that change.

[Gerry Boland (gerboland)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-28 12:30:29 +0000
+++ CMakeLists.txt	2014-07-01 07:57:27 +0000
@@ -15,6 +15,15 @@
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
 
+# We require g++ 4.9, to avoid ABI breakage with earlier version.
+# Note that this must match what is specifed in debian/control.
+set(cxx_version_required 4.9)
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL ${cxx_version_required})
+        message(FATAL_ERROR "g++ version must be ${cxx_version_required}!")
+    endif()
+endif()
+
 include(PrecompiledHeaders)
 include(EnableCoverageReport)
 #####################################################################
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-06-26 11:05:05 +0000
+++ debian/changelog	2014-07-01 07:57:27 +0000
@@ -1,3 +1,9 @@
+unity-api (7.83+14.10.20140626-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Explicitly select g++-4.9 to prevent ABI breakage.
+
+ -- Michi Henning <[e-mail]>  Tue, 01 Jul 2014 17:53:40 +1000
+
 unity-api (7.83+14.10.20140626-0ubuntu1) utopic; urgency=medium
 
   [ Michal Hruby ]
 
=== modified file 'debian/control'
--- debian/control	2013-07-02 10:47:19 +0000
+++ debian/control	2014-07-01 07:57:27 +0000
@@ -2,7 +2,8 @@
 Priority: optional
 Section: libs
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9),
+Build-Depends: g++-4.9,
+               debhelper (>= 9),
                cmake,
                doxygen,
                graphviz,
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-26 13:16:14 +0000
+++ debian/rules	2014-07-01 07:57:27 +0000
@@ -5,9 +5,11 @@
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
 # http://ccache.samba.org/manual.html#_precompiled_headers
 export CCACHE_SLOPPINESS=time_macros
 
 %:
 	dh $@ --parallel --fail-missing
-