Merge lp:~charlesk/indicator-datetime/make-gcc-version-explicit into lp:indicator-datetime/13.10

[Charles Kerr]

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:350
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/237/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/237/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/238/rebuild

review: Approve (continuous-integration)

[Thomas Strehl (strehl-t)]

lgtm

review: Approve

[Thomas Strehl (strehl-t)]

review: Needs Fixing

[Charles Kerr (charlesk)]

In IRC, Thomas said that he marked as "Needs Fixing" because of either the gcc string or because of the (missing) dh_auto_configure line... the gcc string looks the same as in the reference version at <https://wiki.ubuntu.com/cpp-11>, and I don't believe we need an override_dh_auto_configure rule here because exporting CC and CXX as environment variables is enough for cmake to pick them up.

So, I'm not sure what needs to be fixed here...

[Steve Langasek (vorlon)]

The build log unambiguously shows that the correct compiler is being invoked at build time.

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-008/+build/6194198/+files/buildlog_ubuntu-utopic-armhf.indicator-datetime_13.10.0%2B14.10.20140718-0ubuntu1_UPLOADING.txt.gz

review: Approve

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-06-12 22:14:46 +0000
+++ debian/control	2014-06-25 16:02:53 +0000
@@ -2,8 +2,11 @@
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
-# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales
+# g++-4.9: since we use c++11 features, explicitly select a g++ version
+#          to protect from ABI breaks in libstdc++
+# language-pack-en-base: needed so unit tests can use 12h and 24h locales
 Build-Depends: cmake,
+               g++-4.9,
                dbus,
                dbus-test-runner,
                python3-dbusmock,
 
=== modified file 'debian/rules'
--- debian/rules	2014-03-24 15:46:04 +0000
+++ debian/rules	2014-06-25 16:02:53 +0000
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+# 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
+
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %: