me
/
guix
Archived
1
0
Fork 0
Code

build-system/gnu: Use the long option name for deterministic archives. 

This is a followup to 3eb34c6.

* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Use
"--enable-deterministic-archives" instead of "-D" to work around
Binutils bug <https://sourceware.org/bugzilla/show_bug.cgi?id=17671>.
* guix/build/gnu-build-system.scm (strip): Likewise.
master
Ludovic Courtès 2016-01-01 00:49:05 +01:00
parent 05f1e95638
commit 7165a91c7d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/build-system/gnu.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -282,7 +282,8 @@ standard packages used as implicit inputs of the GNU build system."
(parallel-tests? #t) (parallel-tests? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-debug" "-D")) (strip-flags ''("--strip-debug"
"--enable-deterministic-archives"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(validate-runpath? #t) (validate-runpath? #t)
@ -417,7 +418,8 @@ is one of `host' or `target'."
(parallel-build? #t) (parallel-tests? #t) (parallel-build? #t) (parallel-tests? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-debug" "-D")) (strip-flags ''("--strip-debug"
"--enable-deterministic-archives"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(validate-runpath? #t) (validate-runpath? #t)

7
guix/build/gnu-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -329,7 +329,8 @@ makefiles."
(objcopy-command (if target (objcopy-command (if target
(string-append target "-objcopy") (string-append target "-objcopy")
"objcopy")) "objcopy"))
(strip-flags '("--strip-debug" "-D")) (strip-flags '("--strip-debug"
"--enable-deterministic-archives"))
(strip-directories '("lib" "lib64" "libexec" (strip-directories '("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
#:allow-other-keys) #:allow-other-keys)
@ -367,7 +368,7 @@ makefiles."
;; `bfd_fill_in_gnu_debuglink_section' function.) No reference to ;; `bfd_fill_in_gnu_debuglink_section' function.) No reference to
;; DEBUG-OUTPUT is kept because bfd keeps only the basename of the debug ;; DEBUG-OUTPUT is kept because bfd keeps only the basename of the debug
;; file. ;; file.
(zero? (system* objcopy-command "-D" (zero? (system* objcopy-command "--enable-deterministic-archives"
(string-append "--add-gnu-debuglink=" (string-append "--add-gnu-debuglink="
(debug-file file)) (debug-file file))
file))) file)))