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 c46e54d9937a7aff3dff104a73802080f6ca59c7..9b48eff564aa7d0bcfe52211e90e57e013e9e4f2 100755 (executable)
--- 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 0a8e74664f67c06beca0b760379f5743e9ce2313..44d0b2bd636219f2f0ee0e9da109ea8e5e940391 100755 (executable)
--- 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