Skip to content

Commit d411bb0

Browse files
committed
Merge bitcoin/bitcoin#35993: guix: build glibc with --enable-kernel=3.17.0
5548818 guix: build glibc with --enable-kernel=3.17.0 (fanquake) Pull request description: Our minimum required kernel version is documented as `3.17.0`. Pass `--enable-kernel=3.17.0` when building glibc, so that version is reflected in the binary, and the version checked in the symbol-check script, aligns with the expected minimum. ACKs for top commit: hebasto: ACK 5548818, tested on Ubuntu 24.04: willcl-ark: ACK 5548818 Tree-SHA512: fc23561d77da80f53cf7564bdb87f5f3c0b23401de79e0801168190d7a99c96e6a60e9437779680b43173572aededf4242b0fba0fe255970f83e6529e3149870
2 parents 381c331 + 5548818 commit d411bb0

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

contrib/guix/manifest_build.scm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,13 @@ chain for " target " development."))
232232
((#:configure-flags flags)
233233
`(append ,flags
234234
;; https://www.gnu.org/software/libc/manual/html_node/Configuring-and-compiling.html
235-
(list "--enable-stack-protector=all",
235+
(list "--enable-bind-now",
236236
"--enable-cet",
237-
"--enable-bind-now",
238-
"--disable-werror",
239-
"--disable-timezone-tools",
237+
"--enable-kernel=3.17.0",
238+
"--enable-stack-protector=all",
240239
"--disable-profile",
240+
"--disable-timezone-tools",
241+
"--disable-werror",
241242
building-on)))
242243
((#:phases phases)
243244
`(modify-phases ,phases

contrib/guix/symbol-check.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@
7272

7373
ELF_ABIS: dict[lief.ELF.ARCH, dict[lief.Header.ENDIANNESS, list[int]]] = {
7474
lief.ELF.ARCH.X86_64: {
75-
lief.Header.ENDIANNESS.LITTLE: [3,2,0],
75+
lief.Header.ENDIANNESS.LITTLE: [3,17,0],
7676
},
7777
lief.ELF.ARCH.ARM: {
78-
lief.Header.ENDIANNESS.LITTLE: [3,2,0],
78+
lief.Header.ENDIANNESS.LITTLE: [3,17,0],
7979
},
8080
lief.ELF.ARCH.AARCH64: {
81-
lief.Header.ENDIANNESS.LITTLE: [3,7,0],
81+
lief.Header.ENDIANNESS.LITTLE: [3,17,0],
8282
},
8383
lief.ELF.ARCH.PPC64: {
84-
lief.Header.ENDIANNESS.LITTLE: [3,10,0],
85-
lief.Header.ENDIANNESS.BIG: [3,2,0],
84+
lief.Header.ENDIANNESS.LITTLE: [3,17,0],
85+
lief.Header.ENDIANNESS.BIG: [3,17,0],
8686
},
8787
lief.ELF.ARCH.RISCV: {
8888
lief.Header.ENDIANNESS.LITTLE: [4,15,0],

0 commit comments

Comments
 (0)