me
/
guix
Archived
1
0
Fork 0
Code

gnu: libgpg-error: Do not assume that target is a triplet. 

Fixes a bug exposed with be5ec2ebb4, which
introduces the “avr” target, which has no hyphen.

* gnu/packages/gnupg.scm (libgpg-error)[arguments]: In ‘cross-symlinks’
phase, adjust code to deal with TARGET lacking a hyphen.

Change-Id: I1aff6a94a7c92626f931c459d1dc0509f9bcfc00
Ludovic Courtès 2023-12-11 23:11:26 +01:00
parent 4bf4e340b7
commit 7217c93486
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/gnupg.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, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
@ -130,11 +130,10 @@
(symlink (string-append "lock-obj-pub." triplet ".h") (symlink (string-append "lock-obj-pub." triplet ".h")
(string-append "src/syscfg/lock-obj-pub." (string-append "src/syscfg/lock-obj-pub."
source ".h"))) source ".h")))
#$(let* ((target (%current-target-system)) #$(let ((target (%current-target-system)))
(architecture
(string-take target (string-index target #\-))))
(cond ((target-linux? target) (cond ((target-linux? target)
(match architecture (match (string-take target
(string-index target #\-))
("armhf" ("armhf"
`(link "arm-unknown-linux-gnueabi" "linux-gnu")) `(link "arm-unknown-linux-gnueabi" "linux-gnu"))
("mips64el" ("mips64el"