Skip to content

Commit ee88320

Browse files
committed
guix: repro: Sort find output in libtool for gcc-8
Otherwise the resulting .a static libraries (e.g. libstdc++.a) will not be reproducible and end up making the Bitcoin binaries non-reproducible as well. See: https://reproducible-builds.org/docs/archives/#gnu-libtool
1 parent ee0a67c commit ee88320

File tree

2 files changed

+398
-2
lines changed

2 files changed

+398
-2
lines changed

contrib/guix/manifest.scm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,16 @@ chain for " target " development."))
130130
(home-page (package-home-page xgcc))
131131
(license (package-license xgcc)))))
132132

133+
(define base-gcc
134+
(package-with-extra-patches gcc-8
135+
(search-our-patches "gcc-8-sort-libtool-find-output.patch")))
136+
133137
(define* (make-bitcoin-cross-toolchain target
134138
#:key
135139
(base-gcc-for-libc gcc-7)
136140
(base-kernel-headers linux-libre-headers-5.4)
137141
(base-libc glibc) ; glibc 2.31
138-
(base-gcc (make-gcc-rpath-link gcc-8)))
142+
(base-gcc (make-gcc-rpath-link base-gcc)))
139143
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
140144
desirable for building Bitcoin Core release binaries."
141145
(make-cross-toolchain target
@@ -153,7 +157,7 @@ desirable for building Bitcoin Core release binaries."
153157
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
154158
(pthreads-xgcc (make-gcc-with-pthreads
155159
(cross-gcc target
156-
#:xgcc (make-ssp-fixed-gcc gcc-8)
160+
#:xgcc (make-ssp-fixed-gcc base-gcc)
157161
#:xbinutils xbinutils
158162
#:libc pthreads-xlibc))))
159163
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and

0 commit comments

Comments
 (0)