From: Maxime Devos <maximedevos@telenet.be>
To: 49025@debbugs.gnu.org
Subject: [bug#49025] [PATCH core-updates 01/37] utils: Define target-linux? predicate.
Date: Mon, 14 Jun 2021 17:37:16 +0200 [thread overview]
Message-ID: <1006ad56f7750b41a6566edc2310105b80434aef.camel@telenet.be> (raw)
In-Reply-To: <cover.1623680697.git.maximedevos@telenet.be>
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
* guix/utils.scm (target-linux?): New predicate.
* tests/utils.scm
("target-linux?"): Test it.
("target-mingw?"): Also test ‘target-mingw?’.
---
guix/utils.scm | 6 ++++++
tests/utils.scm | 17 +++++++++++++++++
2 files changed, 23 insertions(+)
[-- Attachment #2: 0001-utils-Define-target-linux-predicate.patch --]
[-- Type: text/x-patch, Size: 2274 bytes --]
diff --git a/guix/utils.scm b/guix/utils.scm
index 19990ceb8a..4ff2602e23 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,6 +82,7 @@
%current-system
%current-target-system
package-name->name+version
+ target-linux?
target-mingw?
target-arm32?
target-aarch64?
@@ -543,6 +545,10 @@ a character other than '@'."
(idx (values (substring spec 0 idx)
(substring spec (1+ idx))))))
+(define* (target-linux? #:optional (target (or (%current-target-system)
+ (%current-system))))
+ (string-contains target "linux"))
+
(define* (target-mingw? #:optional (target (%current-target-system)))
(and target
(string-suffix? "-mingw32" target)))
diff --git a/tests/utils.scm b/tests/utils.scm
index 7fcbb25552..80a0e669a4 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -289,6 +290,22 @@ skip these tests."
(string-closest "hello" '("kikoo" "helo" "hihihi" "halo"))
(string-closest "hello" '("aaaaa" "12345" "hellohello" "h"))))
+(test-equal "target-linux?"
+ '(#t #f #f #t)
+ (map (compose ->bool target-linux?)
+ '("i686-linux-gnu" "i686-w64-mingw32"
+ ;; Checking that "gnu" is present is not sufficient,
+ ;; as GNU/Hurd exists.
+ "i686-pc-gnu"
+ ;; Some targets have a suffix.
+ "arm-linux-gnueabihf")))
+
+(test-equal "target-mingw?"
+ '(#f #f #t)
+ (map (compose ->bool target-mingw?)
+ '("i686-linux-gnu" "i686-pc-gnu"
+ "i686-w64-mingw32")))
+
(test-end)
(false-if-exception (delete-file temp-file))
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 ` [bug#49025] [PATCH core-updates 09/37] libgpg-error: Prevent silent miscompilation some systems Maxime Devos
2021-06-14 15:37 ` Maxime Devos [this message]
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=1006ad56f7750b41a6566edc2310105b80434aef.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.