From 6c63582cddf7f9aea296aef3bcfebe4bcf8c6fbe Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Jun 2014 10:02:10 -0500 Subject: make g++ 4.9 explicit --- debian/control | 6 +++++- debian/rules | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 5f45bea..6e379ad 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,12 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team -# 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, diff --git a/debian/rules b/debian/rules index d2889aa..cf940f5 100755 --- a/debian/rules +++ b/debian/rules @@ -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 %: -- cgit v1.2.3 From c8714f2ac53d8999d89a78810c6d60694482fdb6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Jun 2014 11:01:05 -0500 Subject: omit unnecessary whitespace --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 6e379ad..6699f31 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team - # 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 -- cgit v1.2.3