Skip to contentSkip to conversation

Partially revert "Cross-compilation fixes."

PATCH In review Elliott Mitchell 3 participants 5 messages Jul 18, 2020 – Jul 21, 2020

lore
Share & tools
lore
#0 lore raw

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

This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.

---
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(-)
tools/Makefile +0 -3
index 7b1f6c4d28..930a533724 100644
@@ -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
Signature · 9 lines
2.20.1



-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         [email protected]  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
#1 lore raw

________________________________________
From: Elliott Mitchell <[email protected]>
Sent: 18 July 2020 04:31
To: [email protected]
Cc: Ian Jackson; [email protected]; Christian Lindig; [email protected]
Subject: [PATCH 1/2] Partially revert "Cross-compilation fixes."

This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.

---
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(-)
tools/Makefile +0 -3
index 7b1f6c4d28..930a533724 100644
@@ -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

Signature · 1 line
Acked-by: Christian Lindig <[email protected]>
#2 lore raw
In reply to Elliott Mitchell
Quoted 1 line · Elliott Mitchell

This partially reverts commit 16504669c5cbb8b195d20412aadc838da5c428f7.

Ok, so this commit is really old.

Quoted 11 lines

---
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.

Quoted 33 lines
---
 tools/Makefile | 3 ---
 1 file changed, 3 deletions(-)
tools/Makefile +0 -3
index 7b1f6c4d28..930a533724 100644
@@ -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
Signature · 9 lines
2.20.1



-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         [email protected]  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
#3 lore raw
Quoted 4 lines · Wei Liu
Quoted 1 line · Elliott Mitchell

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.

Quoted 14 lines
Quoted 10 lines

---
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.

Quoted 6 lines

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.

Signature · 4 lines
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         [email protected]  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
#4 lore raw
Quoted 23 lines · Elliott Mitchell
Quoted 4 lines · Wei Liu
Quoted 1 line · Elliott Mitchell

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.

Quoted 14 lines
Quoted 10 lines

---
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.

Quoted 8 lines
Quoted 6 lines

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.