diff options
author | Andrew Chow <achow101-github@achow101.com> | 2022-03-18 10:50:35 -0400 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2022-06-28 14:19:33 +0100 |
commit | 54faac968971131161f7d6c8def01af1aff4c6b6 (patch) | |
tree | 5a22689fad8ced062148f09c2f23e188d189962e /contrib/guix/manifest.scm | |
parent | 1d4d711de2d9beb20339da92dea298850da354b1 (diff) | |
download | bitcoin-54faac968971131161f7d6c8def01af1aff4c6b6.tar.xz |
guix: Remove guix store paths from glibc
Without ffile-prefix-map, the debug symbols will contain paths for the
guix store which will include the hashes of each package. However, the
hash for the same package will differ when on different architectures.
In order to be reproducible regardless of the architecture used to build
the package, map all guix store prefixes to something fixed, e.g. /usr.
We might be able to drop this in favour of using --with-nonshared-cflags
when we being using newer versions of glibc.
Diffstat (limited to 'contrib/guix/manifest.scm')
-rw-r--r-- | contrib/guix/manifest.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 36d8dddab6..afc9ae8d26 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -549,7 +549,8 @@ inspecting signatures in Mach-O binaries.") "glibc-versioned-locpath.patch" "glibc-2.24-elfm-loadaddr-dynamic-rewrite.patch" "glibc-2.24-no-build-time-cxx-header-run.patch" - "glibc-2.24-fcommon.patch")))))) + "glibc-2.24-fcommon.patch" + "glibc-2.24-guix-prefix.patch")))))) (define-public glibc-2.27/bitcoin-patched (package @@ -566,7 +567,8 @@ inspecting signatures in Mach-O binaries.") "1b2n1gxv9f4fd5yy68qjbnarhf8mf4vmlxk10i3328c1w5pmp0ca")) (patches (search-our-patches "glibc-ldd-x86_64.patch" "glibc-2.27-riscv64-Use-__has_include-to-include-asm-syscalls.h.patch" - "glibc-2.27-dont-redefine-nss-database.patch")))))) + "glibc-2.27-dont-redefine-nss-database.patch" + "glibc-2.27-guix-prefix.patch")))))) (packages->manifest (append |