diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-07-27 18:06:14 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-07-27 18:06:14 +0000 |
| commit | ad6c0d6c682231e7cdb1292b0741550a01c7ccee (patch) | |
| tree | 962ed1f6f2847ff01291d5cf43eb35f31121910a /debian | |
| parent | 074bee9fbc895b436639010e91a6d1e1ecbee6cb (diff) | |
| parent | e2e03d4aa464b72aedc8d23589cd504f48283192 (diff) | |
| download | ayatana-indicator-datetime-ad6c0d6c682231e7cdb1292b0741550a01c7ccee.tar.gz ayatana-indicator-datetime-ad6c0d6c682231e7cdb1292b0741550a01c7ccee.tar.bz2 ayatana-indicator-datetime-ad6c0d6c682231e7cdb1292b0741550a01c7ccee.zip | |
drop build-dependency on g++-4.9 Fixes: #1452319
Approved by: Pete Woods, PS Jenkins bot, Rodney Dawes
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/debian/control b/debian/control index e9f14ec..4ba24f1 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,6 @@ Build-Depends: cmake, libedataserver1.2-dev (>= 3.5), liburl-dispatcher1-dev, libproperties-cpp-dev, -# for safeguarding against ABI breaks in libstdc++, explicitly select a g++ version - g++-4.9, # for the test harness: libgtest-dev, libdbustest1-dev, diff --git a/debian/rules b/debian/rules index cf940f5..d2889aa 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,5 @@ #!/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 %: |