From: Maxime Devos <maximedevos@telenet.be>
To: 49025@debbugs.gnu.org
Subject: [bug#49025] [PATCH core-updates 09/37] libgpg-error: Prevent silent miscompilation some systems.
Date: Mon, 14 Jun 2021 17:37:12 +0200 [thread overview]
Message-ID: <48d3a94eacade6a6c34f9258f084fd2ac3ee4d8e.camel@telenet.be> (raw)
In-Reply-To: <cover.1623680697.git.maximedevos@telenet.be>
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
* gnu/packages/gpg.scm
(libgpgerror)[arguments]<#:phases>{cross-symlinks}: Only
link to src/syscfg/lock-obj-pub.linux-gnu.h if the package
is being compiled for a Linux target. Do not link either
if the architecture is unknown, as the headers vary with
the architecture.
---
gnu/packages/gnupg.scm | 40 ++++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 14 deletions(-)
[-- Attachment #2: 0009-libgpg-error-Prevent-silent-miscompilation-some-syst.patch --]
[-- Type: text/x-patch, Size: 3398 bytes --]
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 2f44e6ec6a..de213d381f 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -77,6 +78,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
+ #:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define-public libgpg-error
@@ -94,27 +96,37 @@
(build-system gnu-build-system)
(arguments
(if (%current-target-system)
- `(#:modules ((ice-9 match)
- (guix build gnu-build-system)
+ `(#:modules ((guix build gnu-build-system)
(guix build utils))
#:phases
(modify-phases %standard-phases
;; When cross-compiling, some platform specific properties cannot
;; be detected. Create a symlink to the appropriate platform
- ;; file. See Cross-Compiling section at:
+ ;; file if required. Note that these platform files depend on
+ ;; both the operating system and architecture!
+ ;;
+ ;; See Cross-Compiling section at:
;; https://github.com/gpg/libgpg-error/blob/master/README
(add-after 'unpack 'cross-symlinks
- (lambda* (#:key target inputs #:allow-other-keys)
- (let ((triplet
- (match (string-take target
- (string-index target #\-))
- ("armhf" "arm-unknown-linux-gnueabi")
- ("mips64el" "mips-unknown-linux-gnu")
- (x
- (string-append x "-unknown-linux-gnu")))))
- (symlink
- (string-append "lock-obj-pub." triplet ".h")
- "src/syscfg/lock-obj-pub.linux-gnu.h"))))))
+ (lambda _
+ (define (link triplet source)
+ (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 #\-))))
+ (cond ((target-linux? target)
+ (match architecture
+ ("armhf"
+ `(link "arm-unknown-linux-gnueabi" "linux-gnu"))
+ ("mips64el"
+ `(link "mips-unknown-linux-gnu" "linux-gnu"))
+ ;; Don't always link to the "linux-gnu"
+ ;; configuration, as this is not correct for
+ ;; all architectures.
+ (_ #t)))
+ (#t #t)))))))
'()))
(native-inputs `(("gettext" ,gettext-minimal)))
(home-page "https://gnupg.org")
next prev parent reply other threads:[~2021-06-14 16:01 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1623680697.git.maximedevos@telenet.be>
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 08/37] libgpg-error: Remove trailing #f from phases Maxime Devos
2021-06-14 15:37 ` Maxime Devos [this message]
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 01/37] utils: Define target-linux? predicate Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 03/37] packages: Define this-package-input and this-package-native-input Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 14/37] wrap-python3: Fix cross-compilation Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 12/37] libgcrypt: Fix cross-compilation build error Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 10/37] libgpgerror: Maybe fix a cross-compilation bug Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 11/37] libgpg-error: Fix cross-compilation error Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 16/37] openssl: Remove trailing #t from phases Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 17/37] openssl: Make the #:phases argument a G-expression Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 18/37] openssl: Use G-exp machinery for referring to outputs Maxime Devos
2021-06-14 15:37 ` [bug#49025] [PATCH core-updates 19/37] openssl: Move documentation instead of copying and deleting it Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 21/37] openssl: Find bin/env when cross-compiling Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 36/37] cross-base: Fix cross-compiler for i686-linux-gnu Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 04/37] net-base: Make #:builder argument a G-expression Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 06/37] net-base: Don't cross-compile Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 23/37] readline: Make #:configure-flags a G-expression Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 24/37] readline: Fix build error when cross-compiling Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 25/37] bash: Make #:configure-flags a G-expression Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 26/37] bash: Fix cross-compilation build error Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 27/37] fontconfig: Make the #:configure-flags argument a G-expression Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 28/37] fontconfig: Fix build error when cross-compiling Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 15/37] python: Fix reference to input " Maxime Devos
2021-06-14 15:38 ` [bug#49025] [PATCH core-updates 29/37] glib: Use a correct python in scripts " Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 07/37] tzdata: Don't bother with cross-compiling Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 37/37] meson: Support cross-compilation Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 20/37] openssl: Move all man pages to separate output, not only man3 Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 32/37] tk: Make #:configure-flags a G-expression Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 34/37] libelf: Use the cross-compiler when cross-compiling Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 33/37] tk: Do not use %build-inputs " Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 35/37] opendht: Correct 'nettle' variable name in inputs Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs' Maxime Devos
2021-06-14 15:39 ` [bug#49025] [PATCH core-updates 02/37] utils: Define a target-x86-32? and target-x86-64? predicate Maxime Devos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48d3a94eacade6a6c34f9258f084fd2ac3ee4d8e.camel@telenet.be \
--to=maximedevos@telenet.be \
--cc=49025@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.