[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: gnu: libgpg-error: Do not assume that target is a triplet.
From: |
guix-commits |
Subject: |
01/10: gnu: libgpg-error: Do not assume that target is a triplet. |
Date: |
Mon, 11 Dec 2023 17:50:37 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 7217c9348679d00ebf80fe5285564f6bb198a8fd
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Dec 11 23:11:26 2023 +0100
gnu: libgpg-error: Do not assume that target is a triplet.
Fixes a bug exposed with be5ec2ebb4bde4b4f702a30f08849dff05cceccd, 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
---
gnu/packages/gnupg.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a5b8587a14..2b6a5ec796 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -1,5 +1,5 @@
;;; 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 © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
@@ -130,11 +130,10 @@
(symlink (string-append "lock-obj-pub." triplet ".h")
(string-append "src/syscfg/lock-obj-pub."
source ".h")))
- #$(let* ((target (%current-target-system))
- (architecture
- (string-take target (string-index target #\-))))
+ #$(let ((target (%current-target-system)))
(cond ((target-linux? target)
- (match architecture
+ (match (string-take target
+ (string-index target #\-))
("armhf"
`(link "arm-unknown-linux-gnueabi" "linux-gnu"))
("mips64el"
- branch master updated (4bf4e340b7 -> 46ec8592f7), guix-commits, 2023/12/11
- 01/10: gnu: libgpg-error: Do not assume that target is a triplet.,
guix-commits <=
- 04/10: challenge: Use the same substitute URLs as guix-daemon., guix-commits, 2023/12/11
- 07/10: gnu: openvpn: Update to 2.6.7., guix-commits, 2023/12/11
- 09/10: gnu: lean: Use G-expressions., guix-commits, 2023/12/11
- 10/10: gnu: lean: Update to 3.51.1., guix-commits, 2023/12/11
- 05/10: weather: Use the same substitute URLs as guix-daemon., guix-commits, 2023/12/11
- 06/10: weather: Report unauthorized substitute servers., guix-commits, 2023/12/11
- 08/10: gnu: pdfarranger: Update to 1.10.1., guix-commits, 2023/12/11
- 02/10: doc: suggest using pre-inst-env for git-send-email on foreign distros, guix-commits, 2023/12/11
- 03/10: daemon: Implement ‘substitute-urls’ RPC., guix-commits, 2023/12/11