From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ULNPFhFy92CJ/wAAgWs5BA (envelope-from ) for ; Wed, 21 Jul 2021 03:02:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id eAX4ERFy92DfKgAAbx9fmQ (envelope-from ) for ; Wed, 21 Jul 2021 01:02:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BECF617D10 for ; Wed, 21 Jul 2021 03:02:08 +0200 (CEST) Received: from localhost ([::1]:38626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m60ch-0007QW-Lv for larch@yhetil.org; Tue, 20 Jul 2021 21:02:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m60cc-0007Pw-PN for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m60cc-0007h4-HF for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m60cc-00008w-9q for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH 1/9] gnu: Fix check of =?UTF-8?Q?=E2=80=98%current-system=E2=80=99?= and =?UTF-8?Q?=E2=80=98%current-target-system=E2=80=99?= References: <20210721004615.631777-1-bauermann@kolabnow.com> In-Reply-To: <20210721004615.631777-1-bauermann@kolabnow.com> Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 01:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.1626829286406 (code B ref 49672); Wed, 21 Jul 2021 01:02:02 +0000 Received: (at 49672) by debbugs.gnu.org; 21 Jul 2021 01:01:26 +0000 Received: from localhost ([127.0.0.1]:35745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60c1-00006N-GY for submit@debbugs.gnu.org; Tue, 20 Jul 2021 21:01:26 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:49194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60bz-000067-1g for 49672@debbugs.gnu.org; Tue, 20 Jul 2021 21:01:24 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 8D3A4AF6 for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1626829275; x=1628643676; bh=HGmAUd3j4pQ5uuAEtM2fr+XRrUB4L71iWQgWk7qUi2Q=; b=Yhba2MpXWMDc 8AIBVWUmf5vtO2vHvv2xykyXhnB1Gss+3kLq6tRr0EaHwxb3s0+cFYX1D1Ec0/i8 RXet6o/+h9dNMvyfq9I1ce1LXCtsPbFGqtgmXcRJsXxssTVEeAy1oaW0pBCU0qvx XQvKnDhDahDO2TV7Ogc+luhk4yqYhZIgBjquUx9XZZfPf0xhAgrTP8x46O1PVssy TKkJnvz+wDQUnlukXzl65HjUZ8j5U6THEYd07bZxki7uvHfVKzJIvbowWRIuGjym rfa56zLaAVjXb/2eHNeSiF30VYY/RNLBFmCDJXte0H3VisK2xpd2eE1yYGDMWIBH oCct1nAkekp15rBbjNY+HWf0PpWXJ4Ux3sPulIth6Xmwwj+4IZrlsDgHretmHsDH /cCN8sb17Lk9jL7EUEPV02JbIf8d1c05AmrYCsBEYbroVHq+5qs6VT2m1aEsVK9U l4AtZVOlVRZjW4RAQbo/cWlK6odNGZ+7cXSCW2tGZZoOlVMO6rhFLpKZ9Tvgsta6 UsT7a1isDb1Jxeov3T8uqOnR1NmbfkHEYTXhC1PHhTSGXuzc5ufh9+mg1TLPFVWQ eDUA6TUkYJEtFgaUFvgDQ4NfcCRrBPgkWfiicxbOxDi7aR+hBlrdhaRCSC7uTH8P pf3THZX25Is8wOynbAlCJKcM6HBVH3E= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u09TimJDBscP for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:15 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 23F75AB6 for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:13 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx002.mykolab.com (Postfix) with ESMTPS id DA9AB4337; Wed, 21 Jul 2021 03:01:12 +0200 (CEST) Date: Tue, 20 Jul 2021 22:00:35 -0300 Message-Id: <20210721010043.632012-1-bauermann@kolabnow.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches From: Thiago Jung Bauermann via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626829329; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HGmAUd3j4pQ5uuAEtM2fr+XRrUB4L71iWQgWk7qUi2Q=; b=ApVJNb3hRyatb1z14VM6rKglELV4L51SuLCN9oHO5I700AdvRjA7PiKIyC84hkiw0P9DMU Prc6vtMQ5c6vb+TPaJgV+0GNtFBngpTm0OL8uPLUm6LPL9JCj1ZR9fpQyGf3emi3DPPDn2 z9TQImykfssJQ6tKbJYvcWvygKGBRg2XSVKQ2cB5dFOZI/OhmL5YCgtEPN7OhGGx8jXKHY hiS5diolXKuuwafRoJtQr2FY1Cw+pg8foij/6erYuOfM7dueKZ0jlH4R7Qwfq1fDus61Lm en++auaILRIY8o92E7MGuEOVJCFUIT/3WLl2ib77GZVbxuahR/QfHKqDKR+nGA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626829329; a=rsa-sha256; cv=none; b=Vf+3AkyXdDwMzhlc+227Zlzzzf7wchPrk4UyvrbBL+olfX2KEfNtiyPxzPkjuxs183Bl7Q GboCaRW/0EzuZCdsQHaz2386Y2A4aAZmljU4ic5EGjHkB/Vf8rwB4EaKZrUzbSN951JAyg 95DZMEx43Cqd4zYmYI5B/nDqVGkeHtBNqTPTbdpDeKebvLkvqvZke1cZOU6obroybGQmTh osrHeWxVegBXj0k1CtKS9VgfLWR4Lz/6ezM/30b17b+JYWQU1rworzyPHFi+IcLDRjzr6T S9ufz065/wLkIbKhbKBdhXxCwXgSuKG2s1hPan2Jj1q5aAGVvcm2lZEUaSZoiA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=Yhba2MpX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=Yhba2MpX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BECF617D10 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: fBSb+H1hjGEE The order of the check is important because ‘%current-system’ is always defined, while ‘%current-target-system’ is only defined when cross-building. Therefore, it’s important to check ‘%current-target-system’ first, otherwise the cross-build target is never considered. * gnu/packages/bdw-gc.scm (libgc)[arguments]<#:configure-flags>: Check ‘%current-target-system’ first. * gnu/packages/crypto.scm (libb2)[arguments]<#:configure-flags>: Likewise. * gnu/packages/golang.scm (go-1.4)[arguments]<#:system>: Likewise. (go-1.14)[arguments]<#:system>: Likewise. * gnu/packages/java.scm (jamvm-1-bootstrap)[arguments]<#:phases>: Likewise. [native-inputs]: Likewise. (ant-bootstrap)[arguments]<#:phases>: Likewise. (classpath-jamvm-wrappers)[arguments]<#:builder>: Likewise. * gnu/packages/lisp.scm (clisp)[arguments]<#:configure-flags>: Likewise. * gnu/packages/photo.scm (lensfun)[arguments]<#:configure-flags>: Likewise. * gnu/packages/php.scm (php)[arguments]<#:phases>: Likewise. * gnu/packages/sdl.scm (sdl-gfx)[arguments]<#:configure-flags>: Likewise. * gnu/packages/telephony.scm (pjproject)[arguments]<#:configure-flags>: Likewise. --- gnu/packages/bdw-gc.scm | 4 ++-- gnu/packages/crypto.scm | 4 ++-- gnu/packages/golang.scm | 8 ++++---- gnu/packages/java.scm | 16 ++++++++-------- gnu/packages/lisp.scm | 4 ++-- gnu/packages/photo.scm | 4 ++-- gnu/packages/php.scm | 4 ++-- gnu/packages/sdl.scm | 4 ++-- gnu/packages/telephony.scm | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index ecac5b93687e..cd834ff11031 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -52,8 +52,8 @@ ;; to configure script. See bug report and discussion: ;; ;; - ,@(if (hurd-triplet? (or (%current-system) - (%current-target-system))) + ,@(if (hurd-triplet? (or (%current-target-system) + (%current-system))) '("--disable-gcj-support") '())))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index fe2cec045d6c..dff9584e07b3 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -867,8 +867,8 @@ data on your platform, so the seed itself will be as random as possible. (arguments `(#:configure-flags (list - ,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) '("x86_64" "i686")) ;; fat only checks for Intel optimisations '("--enable-fat") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a830afa022a6..58688687bba3 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1046,8 +1046,8 @@ your Go binary to be later served from an http.FileSystem.") (guix build utils) (srfi srfi-1)) #:tests? #f ; Tests are run by the all.bash script. - ,@(if (string-prefix? "aarch64-linux" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "aarch64-linux" (or (%current-target-system) + (%current-system))) '(#:system "armhf-linux") '()) #:phases @@ -1199,8 +1199,8 @@ in the style of communicating sequential processes (@dfn{CSP}).") (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:system system) - (if (string-prefix? "aarch64-linux" (or (%current-system) - (%current-target-system))) + (if (string-prefix? "aarch64-linux" (or (%current-target-system) + (%current-system))) "aarch64-linux" system)) ((#:phases phases) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 64df5a2e24a2..e69d62be0802 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -315,8 +315,8 @@ language.") "--enable-runtime-reloc-checks" "--enable-ffi") #:phases - ,(if (string-prefix? "aarch64" (or (%current-system) - (%current-target-system))) + ,(if (string-prefix? "aarch64" (or (%current-target-system) + (%current-system))) ;; Makefiles and the configure script need to be regenerated to ;; incorporate support for AArch64. '(modify-phases %standard-phases @@ -330,8 +330,8 @@ language.") ("zip" ,zip) ("zlib" ,zlib))) (native-inputs - (if (string-prefix? "aarch64" (or (%current-system) - (%current-target-system))) + (if (string-prefix? "aarch64" (or (%current-target-system) + (%current-system))) ;; Additional packages needed for autoreconf. `(("autoconf" ,autoconf) ("automake" ,automake) @@ -401,8 +401,8 @@ JNI.") ;; Without these JamVM options the build may freeze. (substitute* "bootstrap.sh" (("^\"\\$\\{JAVACMD\\}\" " m) - ,@(if (string-prefix? "armhf" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) `((string-append m "-Xnocompact ")) `((string-append m "-Xnocompact -Xnoinlining "))))) @@ -674,8 +674,8 @@ the standard javac executable."))) (for-each (lambda (tool) (with-output-to-file (string-append bin tool) (lambda _ - ,@(if (string-prefix? "armhf" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) `((format #t "#!~a/bin/sh ~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \ gnu.classpath.tools.~a.~a $@" diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d8d7a7394c44..ee43226ff091 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -347,8 +347,8 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") ("libsigsegv" ,libsigsegv))) (arguments `(#:configure-flags '(,@(if (string-prefix? "armhf-linux" - (or (%current-system) - (%current-target-system))) + (or (%current-target-system) + (%current-system))) '("CFLAGS=-falign-functions=4") '()) "--with-dynamic-ffi" diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 673989e06b09..1b646497c91e 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -440,8 +440,8 @@ scene to produce an image that looks much like a tone-mapped image.") "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf")))) (build-system cmake-build-system) (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) + `(,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) '("x86_64" "i686")) ;; SSE and SSE2 are supported only on Intel processors. '() diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 4edff2cfd886..597494e8a94f 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -177,8 +177,8 @@ (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) - ,@(if (string-prefix? "arm" (or (%current-system) - (%current-target-system))) + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) ;; Drop tests known to fail on armhf. '((for-each delete-file (list diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 128bd95af881..bddc0bdbe990 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -200,8 +200,8 @@ system, such as sound redirection over the network.") (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) + `(,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) '("x86_64" "i686")) ;; mmx is supported only on Intel processors. '() diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index f75a168948bb..4957ecca13a0 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -755,8 +755,8 @@ your calls and messages.") "--with-external-srtp" "--with-external-pa" ;; The following flag is Linux specific. - ,@(if (string-contains (or (%current-system) - (%current-target-system)) "linux") + ,@(if (string-contains (or (%current-target-system) + (%current-system)) "linux") '("--enable-epoll") '()) "--with-gnutls" ;disable OpenSSL checks