From e2a150595d74796996b62565015ca6f5561f118d Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 17 Jul 2015 11:42:45 +0200
Subject: abi bump for gcc-5

* abi bump for gcc-5
* debian/control
  - rename libapt-pkg4.12 -> libapt-pkg4.16,
    the versions 4.13-4.15 are already taken in experimental
  - rename libapt-inst1.5 -> libapt-inst1.7,
    version 1.6 is already taken in experimental
  - build-depend on gcc-5 (>= 5.2.1-10) temporarily
* debian/rules:
    - build with -O2 everywhere because of
      https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66868
---
 debian/rules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index b2583b1ee..0101a303d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,11 @@ ifneq (,$(shell which dpkg-buildflags))
   # make does not export to $(shell) so we need to workaround 
   # (http://savannah.gnu.org/bugs/?10593)
   dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags
-  export CXXFLAGS = $(shell $(dpkg_buildflags) --get CXXFLAGS)
+
+  # workaround gcc-5 compile error
+  # (see https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1473674)
+  export CXXFLAGS = $(subst -O3,-O2,$(shell $(dpkg_buildflags) --get CXXFLAGS))
+
   export LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS)
   export CPPFLAGS = $(shell $(dpkg_buildflags) --get CPPFLAGS)
 else
-- 
cgit v1.2.3