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)

diff --git a/debian/changelog b/debian/changelog
index 4c672caddc45d9c0332484d4cb89771a6ea60c84..c845310a13b7817416992f0d047fb235a98f4468 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ openafs (1.4.11+dfsg-6) UNRELEASED; urgency=low
     Linux headers aren't installed.  Based on code from the common DKMS
     postinst script (which we'll just use once it's reliably available).
     Thanks, Anders Kaseorg.  (LP: #487535)
+  * 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)
   * Change section of openafs-modules-dkms to kernel to match override.
 
  -- Russ Allbery <rra@debian.org>  Tue, 03 Nov 2009 23:27:49 -0800

diff --git a/debian/module/rules b/debian/module/rules
index f7d20758e80d7bae8fe1e84504d6a093fead6d3f..841362418938d5cf83246b1f1a99d9ee8d49ef25 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 =
@@ -58,7 +58,7 @@ configure-stamp:
        sh debian/prep-modules $(KSRC)
        sh configure --with-afs-sysname=$(SYS_NAME) \
            --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp \
-           --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 6bf6d6082302b38664eca28434d346cc6d797755..aa5fd58ca998825a63f072ba41e64cd501e6564a 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 =
@@ -94,15 +94,14 @@ build-stamp:
        mv doc/man-pages/pod1/up.pod doc/man-pages/pod1/afs-up.pod
        rm -f doc/man-pages/man1/up.1
        sh regen.sh
-       afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \
-           sh configure \
-           --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
-           --prefix=/usr --mandir=\$${prefix}/share/man \
-           --sysconfdir=/etc --libexecdir=/usr/lib \
-           --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \
-           --enable-supergroups --enable-largefile-fileserver \
-           --enable-bos-new-config --with-xslt-processor=xsltproc \
-           --with-html-xsl=$(HTML_XSL) --enable-debug --enable-lwp-debug \
+       afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local sh    \
+           configure --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
+           --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc   \
+           --libexecdir=/usr/lib --localstatedir=/var/lib                   \
+           --with-krb5-conf=/usr/bin/krb5-config --enable-supergroups       \
+           --enable-largefile-fileserver --enable-bos-new-config            \
+           --with-xslt-processor=xsltproc --with-html-xsl=$(HTML_XSL)       \
+           --disable-strip-binaries --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