[PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[George Dunlap]

Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add
macro debugging information') exposed a bug whereby the autoconf stuff
in tools was setting its own debug value (defaulting to ENABLED, even
for releases) instead of honoring the value set in Config.mk.

After that changeset, if the global build has -D_FORTIFY_SOURCE
enabled (as is the default in CentOS 7 rpmbuild), then the tools build
will fail (because debug builds default to on).

There should be only one place to specify whether to build debug or
not, and Config.mk is already included by the relevant makefiles.  So
simply remove the tools/configure debug option and everything falls
into place naturally.

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
---

This is functionally a regression in 4.6, and so should be considered
for inclusion in 4.6.

CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Roger Pau Monne <roger.pau@citrix.com>
CC: Euan Harris <euan.harris@citrix.com>
---
 tools/configure    | 26 --------------------------
 tools/configure.ac |  1 -
 2 files changed, 27 deletions(-)

diff --git a/tools/configure b/tools/configure
index 428b3a5..884ce0a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -707,7 +707,6 @@ rombios
 qemu_traditional
 blktap2
 LINUX_BACKEND_MODULES
-debug
 seabios
 ovmf
 xsmpolicy
@@ -798,7 +797,6 @@ enable_ocamltools
 enable_xsmpolicy
 enable_ovmf
 enable_seabios
-enable_debug
 with_linux_backend_modules
 enable_blktap2
 enable_qemu_traditional
@@ -1473,7 +1471,6 @@ Optional Features:
   --disable-xsmpolicy     Disable XSM policy compilation (default is ENABLED)
   --enable-ovmf           Enable OVMF (default is DISABLED)
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
-  --disable-debug         Disable debug build of tools (default is ENABLED)
   --enable-blktap2        Enable blktap2, (DEFAULT is on for Linux, otherwise
                           off)
   --enable-qemu-traditional
@@ -4114,29 +4111,6 @@ seabios=$ax_cv_seabios
 
 
 
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
-fi
-
-
-if test "x$enable_debug" = "xno"; then :
-
-    ax_cv_debug="n"
-
-elif test "x$enable_debug" = "xyes"; then :
-
-    ax_cv_debug="y"
-
-elif test -z $ax_cv_debug; then :
-
-    ax_cv_debug="y"
-
-fi
-debug=$ax_cv_debug
-
-
-
 
 # Check whether --with-linux-backend-modules was given.
 if test "${with_linux_backend_modules+set}" = set; then :
diff --git a/tools/configure.ac b/tools/configure.ac
index 7daec99..6c70040 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -83,7 +83,6 @@ AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
 AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation])
 AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
 AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
-AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
 
 AC_ARG_WITH([linux-backend-modules],
     AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"],
-- 
1.9.1

Re: [PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[George Dunlap]

On 09/02/2015 10:34 AM, George Dunlap wrote:
> Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add
> macro debugging information') exposed a bug whereby the autoconf stuff
> in tools was setting its own debug value (defaulting to ENABLED, even
> for releases) instead of honoring the value set in Config.mk.
> 
> After that changeset, if the global build has -D_FORTIFY_SOURCE
> enabled (as is the default in CentOS 7 rpmbuild), then the tools build
> will fail (because debug builds default to on).
> 
> There should be only one place to specify whether to build debug or
> not, and Config.mk is already included by the relevant makefiles.  So
> simply remove the tools/configure debug option and everything falls
> into place naturally.
> 
> Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

Having debug enabled for tools by default for releases is arguably a bug
for previous releases as well, so I think this should be considered for
backport if this solution is acceptable.

 -George

Re: [PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[Ian Campbell]

On Wed, 2015-09-02 at 10:34 +0100, George Dunlap wrote:
> Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add
> macro debugging information') exposed a bug whereby the autoconf stuff
> in tools was setting its own debug value (defaulting to ENABLED, even
> for releases) instead of honoring the value set in Config.mk.
> 
> After that changeset, if the global build has -D_FORTIFY_SOURCE
> enabled (as is the default in CentOS 7 rpmbuild), then the tools build
> will fail (because debug builds default to on).
> 
> There should be only one place to specify whether to build debug or
> not, and Config.mk is already included by the relevant makefiles.  So
> simply remove the tools/configure debug option and everything falls
> into place naturally.
> 
> Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
> 
> This is functionally a regression in 4.6, and so should be considered
> for inclusion in 4.6.
> 
> CC: Ian Campbell <ian.campbell@citrix.com>
> CC: Ian Jackson <ian.jackson@citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
> CC: Roger Pau Monne <roger.pau@citrix.com>
> CC: Euan Harris <euan.harris@citrix.com>
> ---
>  tools/configure    | 26 --------------------------
>  tools/configure.ac |  1 -
>  2 files changed, 27 deletions(-)
> 
> diff --git a/tools/configure b/tools/configure
> index 428b3a5..884ce0a 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -707,7 +707,6 @@ rombios
>  qemu_traditional
>  blktap2
>  LINUX_BACKEND_MODULES
> -debug
>  seabios
>  ovmf
>  xsmpolicy
> @@ -798,7 +797,6 @@ enable_ocamltools
>  enable_xsmpolicy
>  enable_ovmf
>  enable_seabios
> -enable_debug
>  with_linux_backend_modules
>  enable_blktap2
>  enable_qemu_traditional
> @@ -1473,7 +1471,6 @@ Optional Features:
>    --disable-xsmpolicy     Disable XSM policy compilation (default is 
> ENABLED)
>    --enable-ovmf           Enable OVMF (default is DISABLED)
>    --disable-seabios       Disable SeaBIOS (default is ENABLED)
> -  --disable-debug         Disable debug build of tools (default is 
> ENABLED)
>    --enable-blktap2        Enable blktap2, (DEFAULT is on for Linux, 
> otherwise
>                            off)
>    --enable-qemu-traditional
> @@ -4114,29 +4111,6 @@ seabios=$ax_cv_seabios
>  
>  
>  
> -# Check whether --enable-debug was given.
> -if test "${enable_debug+set}" = set; then :
> -  enableval=$enable_debug;
> -fi
> -
> -
> -if test "x$enable_debug" = "xno"; then :
> -
> -    ax_cv_debug="n"
> -
> -elif test "x$enable_debug" = "xyes"; then :
> -
> -    ax_cv_debug="y"
> -
> -elif test -z $ax_cv_debug; then :
> -
> -    ax_cv_debug="y"
> -
> -fi
> -debug=$ax_cv_debug
> -
> -
> -
>  
>  # Check whether --with-linux-backend-modules was given.
>  if test "${with_linux_backend_modules+set}" = set; then :
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 7daec99..6c70040 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -83,7 +83,6 @@ AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml 
> tools])
>  AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation])
>  AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
>  AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
> -AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
>  
>  AC_ARG_WITH([linux-backend-modules],
>      AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"],

Re: [PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[Wei Liu]

On Wed, Sep 02, 2015 at 10:34:55AM +0100, George Dunlap wrote:
> Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add
> macro debugging information') exposed a bug whereby the autoconf stuff
> in tools was setting its own debug value (defaulting to ENABLED, even
> for releases) instead of honoring the value set in Config.mk.
> 
> After that changeset, if the global build has -D_FORTIFY_SOURCE
> enabled (as is the default in CentOS 7 rpmbuild), then the tools build
> will fail (because debug builds default to on).
> 
> There should be only one place to specify whether to build debug or
> not, and Config.mk is already included by the relevant makefiles.  So
> simply remove the tools/configure debug option and everything falls
> into place naturally.
> 
> Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

Re: [PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[Ian Campbell]

On Wed, 2015-09-02 at 12:08 +0100, Wei Liu wrote:
> On Wed, Sep 02, 2015 at 10:34:55AM +0100, George Dunlap wrote:
> > Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add
> > macro debugging information') exposed a bug whereby the autoconf stuff
> > in tools was setting its own debug value (defaulting to ENABLED, even
> > for releases) instead of honoring the value set in Config.mk.
> > 
> > After that changeset, if the global build has -D_FORTIFY_SOURCE
> > enabled (as is the default in CentOS 7 rpmbuild), then the tools build
> > will fail (because debug builds default to on).
> > 
> > There should be only one place to specify whether to build debug or
> > not, and Config.mk is already included by the relevant makefiles.  So
> > simply remove the tools/configure debug option and everything falls
> > into place naturally.
> > 
> > Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>

Release-ack too?

Re: [PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[Wei Liu]

On Wed, Sep 02, 2015 at 12:24:31PM +0100, Ian Campbell wrote:
> On Wed, 2015-09-02 at 12:08 +0100, Wei Liu wrote:
> > On Wed, Sep 02, 2015 at 10:34:55AM +0100, George Dunlap wrote:
> > > Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add
> > > macro debugging information') exposed a bug whereby the autoconf stuff
> > > in tools was setting its own debug value (defaulting to ENABLED, even
> > > for releases) instead of honoring the value set in Config.mk.
> > > 
> > > After that changeset, if the global build has -D_FORTIFY_SOURCE
> > > enabled (as is the default in CentOS 7 rpmbuild), then the tools build
> > > will fail (because debug builds default to on).
> > > 
> > > There should be only one place to specify whether to build debug or
> > > not, and Config.mk is already included by the relevant makefiles.  So
> > > simply remove the tools/configure debug option and everything falls
> > > into place naturally.
> > > 
> > > Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
> > 
> > Acked-by: Wei Liu <wei.liu2@citrix.com>
> 
> Release-ack too?

Release-acked-by: Wei Liu <wei.liu2@citrix.com>

Re: [PATCH for 4.6] tools: Honor Config.mk debug value, rather than setting our own

[Ian Campbell]

On Wed, 2015-09-02 at 12:25 +0100, Wei Liu wrote:
> On Wed, Sep 02, 2015 at 12:24:31PM +0100, Ian Campbell wrote:
> > On Wed, 2015-09-02 at 12:08 +0100, Wei Liu wrote:
> > > On Wed, Sep 02, 2015 at 10:34:55AM +0100, George Dunlap wrote:
> > > > Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; 
> > > > add
> > > > macro debugging information') exposed a bug whereby the autoconf 
> > > > stuff
> > > > in tools was setting its own debug value (defaulting to ENABLED, 
> > > > even
> > > > for releases) instead of honoring the value set in Config.mk.
> > > > 
> > > > After that changeset, if the global build has -D_FORTIFY_SOURCE
> > > > enabled (as is the default in CentOS 7 rpmbuild), then the tools 
> > > > build
> > > > will fail (because debug builds default to on).
> > > > 
> > > > There should be only one place to specify whether to build debug or
> > > > not, and Config.mk is already included by the relevant makefiles. 
> > > >  So
> > > > simply remove the tools/configure debug option and everything falls
> > > > into place naturally.
> > > > 
> > > > Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
> > > 
> > > Acked-by: Wei Liu <wei.liu2@citrix.com>
> > 
> > Release-ack too?
> 
> Release-acked-by: Wei Liu <wei.liu2@citrix.com>

Thx, applied.