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

[Thomas Voß]

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

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

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

238. By Thomas Voß on 2014-07-21

[ Cemil Azizoglu ]
* Mir display server 0.5.0 release.
* New rebuild forced
[ Alberto Aguirre ]
* Bump Mir dependencies to 0.4.0.
[ Cemil Azizoglu ]
* Bump Mir dependencies to 0.4.0.
[ Kevin Gunn ]
* Bump Mir dependencies to 0.4.0.
[ Sergio Schvezov ]
* Setting -Wl,--no-as-needed for sensors.
[ Ricardo Mendoza ]
* Run thread for dbus client connection (sensors service)
[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
[ thomas-voss ]
* Adjust to API changes in location service. Implement controller
  interface. Add functions to query the accuracy estimates for a
  position update. (LP: #1281817)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/platform-api-ci/345/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/78/console

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

review: Needs Fixing (continuous-integration)

[Colin Watson (cjwatson)]

review: Approve

[Matthias Klose (doko)]

ok

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-07-15 14:02:16 +0000
+++ debian/control	2014-07-21 08:46:26 +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,
@@ -14,8 +18,8 @@
                libmirserver-dev (>= 0.5.0),
                liburl-dispatcher1-dev,
                libdbus-1-dev,
-               libdbus-cpp-dev (>= 2.0.0),
-               libubuntu-location-service-dev (>= 1.0.0),,
+               libdbus-cpp-dev (>= 4.0.0),
+               libubuntu-location-service-dev (>= 1.0.0),
                libgtest-dev,
                libprocess-cpp-dev (>= 0.0.1+14.04.20131212),
                libproperties-cpp-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2014-05-20 14:24:10 +0000
+++ debian/rules	2014-07-21 08:46:26 +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