~ruther/guix-local: gnu: libgpg-error: Do not assume that target is a triplet.

7217c9348679d00ebf80fe5285564f6bb198a8fd — Ludovic Courtès 2 years ago 4bf4e34

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

patch browse .tar.gz

1 files changed, 4 insertions(+), 5 deletions(-)

M gnu/packages/gnupg.scm

M gnu/packages/gnupg.scm => gnu/packages/gnupg.scm +4 -5

@@ 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"