From 76f264f30c6691daa3717d44449f034415ad923c Mon Sep 17 00:00:00 2001
From: short <>
Date: Tue, 23 Sep 2003 12:33:51 +0000
Subject: [PATCH] Optimizations disabling no longer needed due to explicit
 STDCALL workaround.

---
 captive.spec.in |  4 ----
 debian/rules    | 14 ++++++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/captive.spec.in b/captive.spec.in
index 0a7f0c4..586333b 100644
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -113,10 +113,6 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME
 %build
 # Never disable debug for captive, see FAQ
 # 	"How to check valid input arguments? Invalid processing state assumptions?"
-# FIXME: Use our own CFLAGS to prevent '-mcpu=i686' which up to gcc-20030214 gcc
-# will ignore stack freeing of attribute((stdcall)) callees in caller functions code.
-# Check at the final call of src/libcaptive/reactos/ntoskrnl/io/irp.c/IofCallDriver().
-CFLAGS="-O2"
 %configure \
 		--enable-shared --disable-static \
 		--with-readline \
diff --git a/debian/rules b/debian/rules
index 58d0322..a1194fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,15 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+OPTFLAGS := -O2
+else
+OPTFLAGS := -O0
+endif
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -35,12 +44,9 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-# FIXME: Use our own CFLAGS to prevent '-mcpu=i686' which up to gcc-20030214 gcc
-# will ignore stack freeing of attribute((stdcall)) callees in caller functions code.
-# Check at the final call of src/libcaptive/reactos/ntoskrnl/io/irp.c/IofCallDriver().
 config.status: configure
 	dh_testdir
-	CFLAGS="-O2" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 		--enable-shared --disable-static \
 		--with-readline \
 		--disable-bug-replay \
-- 
1.8.3.1