This commit is contained in:
fanquake 2025-03-13 02:10:31 +01:00 committed by GitHub
commit 53a331c91d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 25 deletions

View file

@ -34,11 +34,11 @@ import lief
MAX_VERSIONS = {
'GCC': (4,3,0),
'GLIBC': {
lief.ELF.ARCH.x86_64: (2,31),
lief.ELF.ARCH.ARM: (2,31),
lief.ELF.ARCH.AARCH64:(2,31),
lief.ELF.ARCH.PPC64: (2,31),
lief.ELF.ARCH.RISCV: (2,31),
lief.ELF.ARCH.x86_64: (2,33),
lief.ELF.ARCH.ARM: (2,33),
lief.ELF.ARCH.AARCH64:(2,33),
lief.ELF.ARCH.PPC64: (2,33),
lief.ELF.ARCH.RISCV: (2,33),
},
'LIBATOMIC': (1,0),
'V': (0,5,0), # xkb (bitcoin-qt only)
@ -47,7 +47,7 @@ MAX_VERSIONS = {
# Ignore symbols that are exported as part of every executable
IGNORE_EXPORTS = {
'environ', '_environ', '__environ', '_fini', '_init', 'stdin',
'stdout', 'stderr',
'stdout', 'stderr', '__libc_single_threaded',
}
# Expected linker-loader names can be found here:

View file

@ -99,7 +99,7 @@ chain for " target " development."))
#:key
(base-gcc-for-libc linux-base-gcc)
(base-kernel-headers base-linux-kernel-headers)
(base-libc glibc-2.31)
(base-libc glibc-2.33)
(base-gcc linux-base-gcc))
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
desirable for building Bitcoin Core release binaries."
@ -452,11 +452,11 @@ inspecting signatures in Mach-O binaries.")
(("-rpath=") "-rpath-link="))
#t))))))))
(define-public glibc-2.31
(let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe"))
(define-public glibc-2.33
(let ((commit "5f08d1df2c07904c1dc98bdf2b363c65874266f7"))
(package
(inherit glibc) ;; 2.35
(version "2.31")
(version "2.33")
(source (origin
(method git-fetch)
(uri (git-reference
@ -465,7 +465,7 @@ inspecting signatures in Mach-O binaries.")
(file-name (git-file-name "glibc" commit))
(sha256
(base32
"017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0"))
"0a9bxg13h9m19yx4aihix3l9yylv9vf9szkjj96cjg2zglx1izkf"))
(patches (search-our-patches "glibc-guix-prefix.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments glibc)
@ -478,20 +478,7 @@ inspecting signatures in Mach-O binaries.")
"--disable-werror",
"--disable-timezone-tools",
"--disable-profile",
building-on)))
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'set-etc-rpc-installation-directory
(lambda* (#:key outputs #:allow-other-keys)
;; Install the rpc data base file under `$out/etc/rpc'.
;; Otherwise build will fail with "Permission denied."
;; Can be removed when we are building 2.32 or later.
(let ((out (assoc-ref outputs "out")))
(substitute* "sunrpc/Makefile"
(("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
(string-append out "/etc/rpc" suffix "\n"))
(("^install-others =.*$")
(string-append "install-others = " out "/etc/rpc\n")))))))))))))
building-on))))))))
;; The sponge tool from moreutils.
(define-public sponge