Merge lp:~vorlon/platform-api/explicit-gcc-version into lp:platform-api

[Steve Langasek]

Explicitly select g++-4.9 to prevent from ABI breaks.

Explicitly select g++-4.9 to prevent from ABI breaks.

[lp:~vorlon/platform-api/explicit-gcc-version]

236. By Steve Langasek on 2014-07-12

Revert changelog entry, causing merge conflicts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/platform-api-ci/343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/76
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/76

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-07-01 09:32:25 +0000
+++ debian/control	2014-07-12 06:47:42 +0000
@@ -7,6 +7,10 @@
                debhelper (>= 9),
                doxygen,
                graphviz,
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version.
+               g++-4.9,
                libgles2-mesa-dev,
                libhybris-common-dev,
                pkg-config,
 
=== modified file 'debian/rules'
--- debian/rules	2014-05-20 14:24:10 +0000
+++ debian/rules	2014-07-12 06:47:42 +0000
@@ -2,9 +2,19 @@
 
 DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+include /usr/share/dpkg/default.mk
+
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
+
 override_dh_install:
 	dh_install --fail-missing