[Buildroot] [PATCH v2,1/1] package/guile: fix build on riscv32

[Buildroot] [PATCH v2,1/1] package/guile: fix build on riscv32

[Fabrice Fontaine]

Fix the following build failure on riscv32:

system/base/target.scm:132:16: In procedure triplet-pointer-size:
unknown CPU word size "riscv32"

Fixes:
 - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Set wordsize to 4 instead of 8

 ...stem-base-target.scm-support-riscv32.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/guile/0004-module-system-base-target.scm-support-riscv32.patch

diff --git a/package/guile/0004-module-system-base-target.scm-support-riscv32.patch b/package/guile/0004-module-system-base-target.scm-support-riscv32.patch
new file mode 100644
index 0000000000..a988d2d995
--- /dev/null
+++ b/package/guile/0004-module-system-base-target.scm-support-riscv32.patch
@@ -0,0 +1,33 @@
+From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 6 Aug 2021 19:49:37 +0200
+Subject: [PATCH] module/system/base/target.scm: support riscv32
+
+Fix the following build failure on riscv32:
+
+system/base/target.scm:132:16: In procedure triplet-pointer-size:
+unknown CPU word size "riscv32"
+
+Fixes:
+ - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ module/system/base/target.scm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/module/system/base/target.scm b/module/system/base/target.scm
+index 2088cd866..dba46664d 100644
+--- a/module/system/base/target.scm
++++ b/module/system/base/target.scm
+@@ -116,6 +116,7 @@
+ 
+           ((string-match "^x86_64-.*-gnux32" triplet) 4)  ; x32
+ 
++          ((string-match "32$" cpu) 4)
+           ((string-match "64$" cpu) 8)
+           ((string-match "64_?[lbe][lbe]$" cpu) 8)
+           ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4)
+-- 
+2.30.2
+
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2,1/1] package/guile: fix build on riscv32

[Yann E. MORIN]

Fabrice, All,

On 2021-08-07 22:14 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure on riscv32:
> 
> system/base/target.scm:132:16: In procedure triplet-pointer-size:
> unknown CPU word size "riscv32"
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Set wordsize to 4 instead of 8
> 
>  ...stem-base-target.scm-support-riscv32.patch | 33 +++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 package/guile/0004-module-system-base-target.scm-support-riscv32.patch
> 
> diff --git a/package/guile/0004-module-system-base-target.scm-support-riscv32.patch b/package/guile/0004-module-system-base-target.scm-support-riscv32.patch
> new file mode 100644
> index 0000000000..a988d2d995
> --- /dev/null
> +++ b/package/guile/0004-module-system-base-target.scm-support-riscv32.patch
> @@ -0,0 +1,33 @@
> +From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Fri, 6 Aug 2021 19:49:37 +0200
> +Subject: [PATCH] module/system/base/target.scm: support riscv32
> +
> +Fix the following build failure on riscv32:
> +
> +system/base/target.scm:132:16: In procedure triplet-pointer-size:
> +unknown CPU word size "riscv32"
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + module/system/base/target.scm | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/module/system/base/target.scm b/module/system/base/target.scm
> +index 2088cd866..dba46664d 100644
> +--- a/module/system/base/target.scm
> ++++ b/module/system/base/target.scm
> +@@ -116,6 +116,7 @@
> + 
> +           ((string-match "^x86_64-.*-gnux32" triplet) 4)  ; x32
> + 
> ++          ((string-match "32$" cpu) 4)

I was thinking that '32$' might be too hard a hammer, but it does not
seem that there are that many systems which cpu name ends in 32, but
are not 32-bit. config.guess and config.sub don't know about any, at
least...

Applied to master, thanks.

Please, submit this patch upstream. ;-)

Regards,
Yann E. MORIN.

> +           ((string-match "64$" cpu) 8)
> +           ((string-match "64_?[lbe][lbe]$" cpu) 8)
> +           ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4)
> +-- 
> +2.30.2
> +
> -- 
> 2.30.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2,1/1] package/guile: fix build on riscv32

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure on riscv32:
 > system/base/target.scm:132:16: In procedure triplet-pointer-size:
 > unknown CPU word size "riscv32"

 > Fixes:
 >  - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Yann E. Morin):
 >  - Set wordsize to 4 instead of 8

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot