From: Bdale Garbee <bdale@gag.com>
Date: Wed, 1 Dec 2010 17:18:36 +0000 (-0700)
Subject: patch from Jakub Wilk adding noopt and nostrip build option support
X-Git-Tag: debian/1.7.4p4-5~7
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8e901aee3e022c0cba0996e18f55d0a9ba5a60ce;p=debian%2Fsudo

patch from Jakub Wilk adding noopt and nostrip build option support
---

diff --git a/debian/changelog b/debian/changelog
index 941a569..02a14f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sudo (1.7.4p4-6) UNRELEASED; urgency=low
+
+  * patch from Jakub Wilk to add noopt and nostrip build option support,
+    closes: #605580
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 01 Dec 2010 10:18:01 -0700
+
 sudo (1.7.4p4-5) unstable; urgency=low
 
   * add Vcs entries to the control file
diff --git a/debian/rules b/debian/rules
index 15f94a4..5011197 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,11 @@
 
 export DH_VERBOSE=1
 
-CFLAGS = -O2 -Wall -Wno-comment
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
+CFLAGS = -Wall -Wno-comment -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
 endif
 export CFLAGS