From: Russ Allbery <rra@debian.org>
Date: Tue, 1 Dec 2009 00:06:36 +0000 (-0800)
Subject: Fix configure flags used for debugging and optimization
X-Git-Tag: debian/1.5.73.3-1~52
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=72b520fa83fba2d1a21df3411cd23417f1b841ee;p=packages%2Fo%2Fopenafs.git

Fix configure flags used for debugging and optimization

* Fix configure flags used for enabling or disabling LWP and kernel
  debugging flags and always pass --disable-strip-binaries.  Hopefully
  fixes the empty debugging symbols on Ubuntu.  (LP: #370612)

(cherry picked from commit 3a6b94ee8782fa71fa6ba55ed515fe9edd5962f6)
---

diff --git a/debian/module/rules b/debian/module/rules
index c46e54d99..9b48eff56 100755
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -22,8 +22,8 @@ endif
 # Determine whether we're building with optimization.  This doesn't really
 # work at the moment due to upstream problems.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    DEBIAN_OPT_FLAGS = --disable-optimize --disable-lwp-optimize
-    DEBIAN_KERN_FLAGS = --disable-kernel-optimize
+    DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp
+    DEBIAN_KERN_FLAGS = --disable-optimize-kernel
 else
     DEBIAN_OPT_FLAGS =
     DEBIAN_KERN_FLAGS =
@@ -59,7 +59,7 @@ configure-stamp:
 	sh configure --with-afs-sysname=$(SYS_NAME) \
 	    --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp \
 	    --with-linux-kernel-packaging --enable-disconnected \
-	    --enable-debug --enable-lwp-debug --enable-kernel-debug \
+	    --enable-debug --enable-debug-lwp --enable-debug-kernel \
 	    $(DEBIAN_OPT_FLAGS) $(DEBIAN_KERN_FLAGS)
 	touch $@
 
diff --git a/debian/rules b/debian/rules
index 0a8e74664..44d0b2bd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,8 @@ endif
 # Determine whether we're building with optimization.  This doesn't really
 # work at the moment due to upstream problems.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    DEBIAN_OPT_FLAGS = --disable-optimize --disable-lwp-optimize
-    DEBIAN_KERN_FLAGS = --disable-kernel-optimize
+    DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp
+    DEBIAN_KERN_FLAGS = --disable-optimize-kernel
 else
     DEBIAN_OPT_FLAGS =
     DEBIAN_KERN_FLAGS =
@@ -101,7 +101,7 @@ build-stamp:
 	    --enable-bos-new-config --enable-demand-attach-fs \
 	    --enable-bos-restricted-mode --enable-disconnected \
 	    --with-xslt-processor=xsltproc --with-html-xsl=$(HTML_XSL) \
-	    --enable-debug --enable-lwp-debug $(DEBIAN_OPT_FLAGS) $(SYSTEM)
+	    --enable-debug --enable-debug-lwp $(DEBIAN_OPT_FLAGS) $(SYSTEM)
 	chmod a+x config.sub src/libafs/make_kbuild_makefile.pl \
 	    src/config/make_vnode.pl
 	dh build --after configure