[PATCH 1/2] Partially revert "Cross-compilation fixes."

[PATCH 1/2] Partially revert "Cross-compilation fixes."

[Elliott Mitchell]

This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.

Signed-off-by: Elliott Mitchell <ehem+xen@m5p.com>
---
Doesn't look like much of 16504669c5cbb8b195d20412aadc838da5c428f7
actually remains due to passage of time.

Of the 3, both Python and pygrub appear to mostly be building just fine
cross-compiling.  The OCAML portion is being troublesome, this is going
to cause bug reports elsewhere soon.  The OCAML portion though can
already be disabled by setting OCAML_TOOLS=n and shouldn't have this
extra form of disabling.
---
 tools/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 7b1f6c4d28..930a533724 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -40,12 +40,9 @@ SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
 SUBDIRS-$(CONFIG_X86) += debugger/kdd
 SUBDIRS-$(CONFIG_TESTS) += tests
 
-# These don't cross-compile
-ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 SUBDIRS-y += python
 SUBDIRS-y += pygrub
 SUBDIRS-$(OCAML_TOOLS) += ocaml
-endif
 
 ifeq ($(CONFIG_RUMP),y)
 SUBDIRS-y := libs libxc xenstore
-- 
2.20.1



-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         ehem+sigmsg@m5p.com  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445

Re: [PATCH 1/2] Partially revert "Cross-compilation fixes."

[Christian Lindig]

________________________________________
From: Elliott Mitchell <ehem+xen@m5p.com>
Sent: 18 July 2020 04:31
To: xen-devel@lists.xen.org
Cc: Ian Jackson; wl@xen.org; Christian Lindig; dave@recoil.org
Subject: [PATCH 1/2] Partially revert "Cross-compilation fixes."

This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.

Signed-off-by: Elliott Mitchell <ehem+xen@m5p.com>
---
Doesn't look like much of 16504669c5cbb8b195d20412aadc838da5c428f7
actually remains due to passage of time.

Of the 3, both Python and pygrub appear to mostly be building just fine
cross-compiling.  The OCAML portion is being troublesome, this is going
to cause bug reports elsewhere soon.  The OCAML portion though can
already be disabled by setting OCAML_TOOLS=n and shouldn't have this
extra form of disabling.
---
 tools/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 7b1f6c4d28..930a533724 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -40,12 +40,9 @@ SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
 SUBDIRS-$(CONFIG_X86) += debugger/kdd
 SUBDIRS-$(CONFIG_TESTS) += tests

-# These don't cross-compile
-ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 SUBDIRS-y += python
 SUBDIRS-y += pygrub
 SUBDIRS-$(OCAML_TOOLS) += ocaml
-endif

 ifeq ($(CONFIG_RUMP),y)
 SUBDIRS-y := libs libxc xenstore
--
2.20.1

-- 
Acked-by: Christian Lindig <christian.lindig@citrix.com>

Re: [PATCH 1/2] Partially revert "Cross-compilation fixes."

[Wei Liu]

On Fri, Jul 17, 2020 at 08:31:21PM -0700, Elliott Mitchell wrote:
> This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.

Ok, so this commit is really old.

> 
> Signed-off-by: Elliott Mitchell <ehem+xen@m5p.com>
> ---
> Doesn't look like much of 16504669c5cbb8b195d20412aadc838da5c428f7
> actually remains due to passage of time.
> 
> Of the 3, both Python and pygrub appear to mostly be building just fine
> cross-compiling.  The OCAML portion is being troublesome, this is going
> to cause bug reports elsewhere soon.  The OCAML portion though can
> already be disabled by setting OCAML_TOOLS=n and shouldn't have this
> extra form of disabling.

The reasoning here is fine by me. And it should be part of the commit
message.

I would like to also add "tools: prefix to the subject line:

  tools: Partially revert "Cross-compilation fixes."

If you agree with these changes, no action is required from you. I can
handle everything while committing.

Wei.

> ---
>  tools/Makefile | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/tools/Makefile b/tools/Makefile
> index 7b1f6c4d28..930a533724 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -40,12 +40,9 @@ SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
>  SUBDIRS-$(CONFIG_X86) += debugger/kdd
>  SUBDIRS-$(CONFIG_TESTS) += tests
>  
> -# These don't cross-compile
> -ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
>  SUBDIRS-y += python
>  SUBDIRS-y += pygrub
>  SUBDIRS-$(OCAML_TOOLS) += ocaml
> -endif
>  
>  ifeq ($(CONFIG_RUMP),y)
>  SUBDIRS-y := libs libxc xenstore
> -- 
> 2.20.1
> 
> 
> 
> -- 
> (\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
>  \BS (    |         ehem+sigmsg@m5p.com  PGP 87145445         |    )   /
>   \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
> 8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
> 
> 

Re: [PATCH 1/2] Partially revert "Cross-compilation fixes."

[Elliott Mitchell]

On Tue, Jul 21, 2020 at 12:26:45PM +0000, Wei Liu wrote:
> On Fri, Jul 17, 2020 at 08:31:21PM -0700, Elliott Mitchell wrote:
> > This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.
> 
> Ok, so this commit is really old.

Yup.  It will still be visible in `git blame tools/examples/Makefile`,
but everywhere else has had commits stacked on top.

> > Signed-off-by: Elliott Mitchell <ehem+xen@m5p.com>
> > ---
> > Doesn't look like much of 16504669c5cbb8b195d20412aadc838da5c428f7
> > actually remains due to passage of time.
> > 
> > Of the 3, both Python and pygrub appear to mostly be building just fine
> > cross-compiling.  The OCAML portion is being troublesome, this is going
> > to cause bug reports elsewhere soon.  The OCAML portion though can
> > already be disabled by setting OCAML_TOOLS=n and shouldn't have this
> > extra form of disabling.
> 
> The reasoning here is fine by me. And it should be part of the commit
> message.
> 
> I would like to also add "tools: prefix to the subject line:
> 
>   tools: Partially revert "Cross-compilation fixes."
> 
> If you agree with these changes, no action is required from you. I can
> handle everything while committing.

Fine by me.


-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         ehem+sigmsg@m5p.com  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445

Re: [PATCH 1/2] Partially revert "Cross-compilation fixes."

[Wei Liu]

On Tue, Jul 21, 2020 at 07:44:10AM -0700, Elliott Mitchell wrote:
> On Tue, Jul 21, 2020 at 12:26:45PM +0000, Wei Liu wrote:
> > On Fri, Jul 17, 2020 at 08:31:21PM -0700, Elliott Mitchell wrote:
> > > This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.
> > 
> > Ok, so this commit is really old.
> 
> Yup.  It will still be visible in `git blame tools/examples/Makefile`,
> but everywhere else has had commits stacked on top.
> 
> > > Signed-off-by: Elliott Mitchell <ehem+xen@m5p.com>
> > > ---
> > > Doesn't look like much of 16504669c5cbb8b195d20412aadc838da5c428f7
> > > actually remains due to passage of time.
> > > 
> > > Of the 3, both Python and pygrub appear to mostly be building just fine
> > > cross-compiling.  The OCAML portion is being troublesome, this is going
> > > to cause bug reports elsewhere soon.  The OCAML portion though can
> > > already be disabled by setting OCAML_TOOLS=n and shouldn't have this
> > > extra form of disabling.
> > 
> > The reasoning here is fine by me. And it should be part of the commit
> > message.
> > 
> > I would like to also add "tools: prefix to the subject line:
> > 
> >   tools: Partially revert "Cross-compilation fixes."
> > 
> > If you agree with these changes, no action is required from you. I can
> > handle everything while committing.
> 
> Fine by me.

Your two patches have been applied to staging. Thanks.

Wei.