瀏覽代碼

package/glibc: glibc on or1k needs a toolchain w/ headers >= 5.4

Commit [1] enabled glibc on or1k since it's now supported but it
requires a toolchain with linux-headers >= 5.4.

From [2]:
"Here we define the minumum linux kernel version at 5.4.0, as that is the
long term support version where 32-bit architectures start to support
64-bit time API's.  The OpenRISC kernel had some bugs up until version 5.8
which caused issues with glibc fork/clone, they have been backported to
5.4 but not previous versions."

Fixes:

  checking installed Linux kernel header files... 3.2.0 or later
  checking for kernel header at least 5.4.0... too old!
  configure: error: *** The available kernel headers are older than the requested

https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/2875256686

[1] 68d0aede597d32816c5b2ff32de0ce33cc14eb93
[2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c3c62ca7d9ff3bdacdd13e636bc858101e3e288

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
Romain Naour 2 年之前
父節點
當前提交
7537419257
共有 2 個文件被更改,包括 5 次插入0 次删除
  1. 1 0
      package/glibc/Config.in
  2. 4 0
      toolchain/toolchain-buildroot/Config.in

+ 1 - 0
package/glibc/Config.in

@@ -36,6 +36,7 @@ config BR2_PACKAGE_GLIBC_SUPPORTS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 || !BR2_or1k
 
 
 if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 
 

+ 4 - 0
toolchain/toolchain-buildroot/Config.in

@@ -67,6 +67,10 @@ comment "glibc on ARC needs a toolchain w/ headers >= 5.1"
 	depends on BR2_arc
 	depends on BR2_arc
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
 
 
+comment "glibc on or1k needs a toolchain w/ headers >= 5.4"
+	depends on BR2_or1k
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+
 config BR2_TOOLCHAIN_BUILDROOT_MUSL
 config BR2_TOOLCHAIN_BUILDROOT_MUSL
 	bool "musl"
 	bool "musl"
 	depends on BR2_PACKAGE_MUSL_SUPPORTS
 	depends on BR2_PACKAGE_MUSL_SUPPORTS