From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8PzZLkXaQGI6dQAAgWs5BA (envelope-from ) for ; Sun, 27 Mar 2022 23:42:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eGOOJ0XaQGJkaQEAG6o9tA (envelope-from ) for ; Sun, 27 Mar 2022 23:42:29 +0200 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 28CE32A4B9 for ; Sun, 27 Mar 2022 23:42:29 +0200 (CEST) Received: from localhost ([::1]:36646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYaea-0007Co-CC for larch@yhetil.org; Sun, 27 Mar 2022 17:42:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYaeB-0006ur-8f for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYaeB-0005Yw-0E for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYaeA-0004Xf-Uc for guix-patches@gnu.org; Sun, 27 Mar 2022 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 6/6] 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?= Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:42: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: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841727917395 (code B ref 49672); Sun, 27 Mar 2022 21:42:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:41:19 +0000 Received: from localhost ([127.0.0.1]:56697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadT-0004WU-8R for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:19 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:3316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYadS-0004W9-3f for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:41:18 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id A9C641AC1; Sun, 27 Mar 2022 23:41:12 +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 :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417272; x=1650231673; bh=mZaIo0Szcjukf01ZRhCVfZyUiIS9VO8PnzR suaRQw2Y=; b=cFfPIG3vMhwvXAEMFZvzJ37ZDYZFEamKS1Aa2RiyI2ejZzZcvwT VH+jVY5niOZXTbZhVYgGPRd7ilJM65YIKZN//sc536cbNtULsdzBJVLGyCqOBKz5 T8+yNRK23PWK21ELHQKE6p//3brVmA12yiP/Y6iCytktukevz22C6rxRMEfUzT/k tHj+R4pukgjZRzR/zYDgovmwqT+od3YR9KNiwL2QfvDfKHHujEMwl0e9IA3eilFV 3yrcx2NcNtG3MUcYWpwhWbiQ5wvGlE9bx53l6AMf1ggUQoAfHend/fkxiFA6R4xb B0xTxR3o0NZFtFvV9rNDa+jKm/BgQhU8esx23dA4kGPQF/6EWXVBt6bl23ukmCUo EBwjW56AMhApPepMqb4TmDHkA2ScYzxPyTIWsnLP4CGpwo40lZamnBd0qtAFT/tA 5YJx0siGkTqgJvGtK3rpvTHqlH7Mb5ROtPay0Y74dEw5pfcUNArCmekaxcsY1bhM OIRi11cVxEOs0NiEKeg7P0ueUm0qyQyfIe61t4VzEY+obHYtfdtZ8z8k18xqljqF RMwbfFzAfAtRFqy5LekaSfPsk2MYtzanfGVVvnxsZJLSaGUr0Xo2iRjDM4LvyvYy wycyyKNAYe4AYx1RrE5KYnZxWFFiPJ9VvhJyrJbESynHPzXWiJ4dbuxA= 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 ZyN-o9NaEyYj; Sun, 27 Mar 2022 23:41:12 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id EACB2FDB; Sun, 27 Mar 2022 23:41:11 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 33BC6BB1; Sun, 27 Mar 2022 23:41:11 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:26 -0300 Message-Id: <20220327214026.102723-7-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-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 X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648417349; 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=mZaIo0Szcjukf01ZRhCVfZyUiIS9VO8PnzRsuaRQw2Y=; b=MbkrLZ4M+HcH1NCKbkM8f10dWyCX6FpaXQ9ERwCISzA+vIkg3QG9ZazF5A4WuIoUGvwHRu SVs6GchxIJnTsVJcxfg7tGBwPjW9L/sfiYV/RKWn6IewrbPzqymncbcxRUj18ks7ciBoVd N9mbEG9kwU1folnbWERyq8CDx2EkGUp3vIFNDBk+1YS76LSXmf9fqS49qoDgW6QKeREFQ6 jHJDxUZtljFUpqCwYw3hn8YRE2LzueEZxSp7gZDL+HO+PX5eS1DK8A/tMLUbL53qOHri0U ZkHTmPuaWMwHyCH1DLwYmjViL8ucLSPaNluPXaEmc+VB6/2rhRHd4DlaFFGMag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648417349; a=rsa-sha256; cv=none; b=XWMaNKUkv4+NcgCz35xbe7av+wRSL9ZyqoU1Lk05/l14IGz3nJ6LpwGL7DgN1mT7iKZ/aL 0JYSn3TR+i6ZLKPwrEr1jsSlCOY426PB2TCh2PQhge674AEQ9WGjVI5xo9CI0rB7x0Fp6W Kw3vLCZ4dIg0V5zM35wO3mPbkc6t2MGYhc9SjTN045JhwrxM4VqZ3on4RZNJR8Ov5uVQ7N Zt8t7uys5ZNisKvWxCrMdJjpinC7/OOhdmsny/gzLzbcFmLCyNF8l0Ofl+n91SBTdQOBnu 6g3RySCgskLl7t2c2ELQWHNMUB1UNATbqVD51HDLZolwHhmzrUDKkIsZFjMB2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=cFfPIG3v; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.37 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=cFfPIG3v; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 28CE32A4B9 X-Spam-Score: -4.37 X-Migadu-Scanner: scn0.migadu.com X-TUID: Zsbf0HpTb8t4 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 target is never considered. * gnu/packages/crypto.scm (libb2)[arguments]<#:configure-flags>: Check ‘%current-target-system’ first. * 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/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/crypto.scm | 4 ++-- gnu/packages/java.scm | 16 ++++++++-------- gnu/packages/photo.scm | 4 ++-- gnu/packages/php.scm | 4 ++-- gnu/packages/sdl.scm | 4 ++-- gnu/packages/telephony.scm | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 63be51f86a21..89694f111e17 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -826,8 +826,8 @@ (define-public libb2 (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/java.scm b/gnu/packages/java.scm index aead02d93c31..77f9f7e8fb86 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -207,8 +207,8 @@ (define jamvm-1-bootstrap "--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 @@ -218,8 +218,8 @@ (define jamvm-1-bootstrap (inputs (list classpath-bootstrap jikes libffi zip 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) @@ -285,8 +285,8 @@ (define ant-bootstrap ;; 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 "))))) @@ -535,8 +535,8 @@ (define classpath-jamvm-wrappers (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/photo.scm b/gnu/packages/photo.scm index 2f561abc2f31..eaa905dd3b8c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -426,8 +426,8 @@ (define-public lensfun "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 191dcafb4ae4..e2489d2435a6 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -177,8 +177,8 @@ (define-public php (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 4c38e2f05507..a5892934d824 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -198,8 +198,8 @@ (define-public sdl-gfx (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 e3071d9b75a7..c694a906f1d0 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -755,8 +755,8 @@ (define-public pjproject "--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