From ff2f146a53edbdbdba543b2700d6fcd17a40edb0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 22 Feb 2017 15:15:29 +0100 Subject: [PATCH] pkg/kamailio/deb: strip default -02 from CC_EXTRA_OPTS Fix #1004 (cherry picked from commit 6ba9900f3c83bbd68ef868a8910590f6c9fbe88f) --- pkg/kamailio/deb/debian/rules | 4 ++-- pkg/kamailio/deb/jessie/rules | 4 ++-- pkg/kamailio/deb/precise/rules | 4 ++-- pkg/kamailio/deb/sid/rules | 4 ++-- pkg/kamailio/deb/stretch/rules | 4 ++-- pkg/kamailio/deb/trusty/rules | 4 ++-- pkg/kamailio/deb/wheezy/rules | 4 ++-- pkg/kamailio/deb/xenial/rules | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index a3e12f97847..b6f212e1934 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -107,8 +107,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index 0f6fe62a56e..cf06e1cde8f 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -107,8 +107,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index 749e8156d4f..be000578365 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -106,8 +106,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules index ab1b2d4540b..4f3c0fca6b9 100755 --- a/pkg/kamailio/deb/sid/rules +++ b/pkg/kamailio/deb/sid/rules @@ -107,8 +107,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/stretch/rules b/pkg/kamailio/deb/stretch/rules index ab1b2d4540b..4f3c0fca6b9 100755 --- a/pkg/kamailio/deb/stretch/rules +++ b/pkg/kamailio/deb/stretch/rules @@ -107,8 +107,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index ce0bbefec42..82dec480eeb 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -107,8 +107,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 749e8156d4f..be000578365 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -106,8 +106,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS) diff --git a/pkg/kamailio/deb/xenial/rules b/pkg/kamailio/deb/xenial/rules index a3e12f97847..b6f212e1934 100755 --- a/pkg/kamailio/deb/xenial/rules +++ b/pkg/kamailio/deb/xenial/rules @@ -107,8 +107,8 @@ endef # CFLAGS + CPPFLAGS -> CC_EXTRA_OPTS CC_EXTRA_OPTS := $(shell dpkg-buildflags --get CPPFLAGS) -CC_EXTRA_OPTS += $(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) +CC_EXTRA_OPTS += $(shell DEB_CFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CFLAGS) +CXXFLAGS := $(shell DEB_CXXFLAGS_MAINT_STRIP=-O2 dpkg-buildflags --get CXXFLAGS) # LDFLAGS -> LD_EXTRA_OPTS LD_EXTRA_OPTS := $(shell dpkg-buildflags --get LDFLAGS)