From patchwork Fri Sep 16 15:53:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6Lev6L6J?= X-Patchwork-Id: 42674 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F25127BBEA; Fri, 16 Sep 2022 16:54:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE58B27BBE9 for ; Fri, 16 Sep 2022 16:54:27 +0100 (BST) Received: from localhost ([::1]:57590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZDff-0003Cy-0v for patchwork@mira.cbaines.net; Fri, 16 Sep 2022 11:54:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZDfH-0003Bv-1I for guix-patches@gnu.org; Fri, 16 Sep 2022 11:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZDfG-0005x5-LE for guix-patches@gnu.org; Fri, 16 Sep 2022 11:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZDfG-00039Z-GN for guix-patches@gnu.org; Fri, 16 Sep 2022 11:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57857] [PATCH] gnu: busybox: fix the cross build. Resent-From: =?utf-8?b?6Lev6L6J?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Sep 2022 15:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57857 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 57857@debbugs.gnu.org Received: via spool by 57857-submit@debbugs.gnu.org id=B57857.166334360712075 (code B ref 57857); Fri, 16 Sep 2022 15:54:02 +0000 Received: (at 57857) by debbugs.gnu.org; 16 Sep 2022 15:53:27 +0000 Received: from localhost ([127.0.0.1]:44003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZDeg-00038h-PG for submit@debbugs.gnu.org; Fri, 16 Sep 2022 11:53:27 -0400 Received: from mail-yw1-f194.google.com ([209.85.128.194]:33437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZDec-00038P-D7 for 57857@debbugs.gnu.org; Fri, 16 Sep 2022 11:53:24 -0400 Received: by mail-yw1-f194.google.com with SMTP id 00721157ae682-3457bc84d53so265433447b3.0 for <57857@debbugs.gnu.org>; Fri, 16 Sep 2022 08:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date; bh=mOtlZa4hTRWqo0TP0RQTu+bjAZtF6K3+wSDqG+8/AzQ=; b=bqvsAK3pBJWNyYYYo9OGIK5cVbjHxlsthUCfeZHlxDqPchXzZfFYFianlnq1wckBEv TU6JLeEMguMnjxhCL67czZ2AX/OBEfkiXuafOVruFMv4Gm08qoDfndW0XwPOwfly//97 u6gNXr/yhByWuettoC3z7KDsYbJg/yjzEBJHe1572TfxZNu9tRTaZBDbC+cUX4fClZG+ yCiO142AD5zHsh9GgKBaNMRhEBzrv9ZMWYALLtEBltVSz/Uk3JJwzwnDtxbDGHf5uHlZ fUhDsskcTVjmPlu2zifyzWgZYfzL19RN2vz40a8ZOGX8UGZyIb3DxGGrXpnqZshoAATj 4fXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=mOtlZa4hTRWqo0TP0RQTu+bjAZtF6K3+wSDqG+8/AzQ=; b=FZXYP+HLg7KqxZ6c5REfo4bOGAycPCh/C91aG0QvHJjVnr+cSZRNCDW5PGuSrTz4l8 IayZsLI6XohDGiZdA+6JPuQN4AXpKAkYt5dj6+1OSwFisk8RYGWpi3ibyYkKpjLLWozL +AeCJs1DjE3+NTYNpJrsEPcmMhrfOaZHD79MeTTmqe4ridodX1US0JbmWHvldWF2cJKK 74UgRuW4GpQu7cI8Da2nedFgZPR6TWj67fjQUR+86+wG0yv/wnsn9CjDA0LmSH35fVvs B85dnbU9/b4PCu8ChqBopD/swSoBNBfywP5a8JM1piGhxMOG2gByUUYLemO/01EK31Dq fd1A== X-Gm-Message-State: ACrzQf3tdNlXFmmErkeDQyQY6kjgXDJh7sybLZBuIRokovKBPqxSoJQh ARPCdegeiszKR/9NyqYGEWsLQ/hM7ICdHR2TNnQ= X-Google-Smtp-Source: AMsMyM6cZ5IVQqk/LLo6FsBC8CNDWidI0TMwuFTOa/4MWRyk6UCLLFRzDntQPLSguMvVfhJe1Be9Y8MuD4HeqYjn+c0= X-Received: by 2002:a81:83d0:0:b0:345:2499:cd76 with SMTP id t199-20020a8183d0000000b003452499cd76mr4956011ywf.500.1663343596776; Fri, 16 Sep 2022 08:53:16 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a0d:d0c6:0:0:0:0:0 with HTTP; Fri, 16 Sep 2022 08:53:14 -0700 (PDT) In-Reply-To: <3044d0d3-8a3b-baf7-b86b-55960e77eec1@telenet.be> References: <3044d0d3-8a3b-baf7-b86b-55960e77eec1@telenet.be> From: =?utf-8?b?6Lev6L6J?= Date: Fri, 16 Sep 2022 15:53:14 +0000 Message-ID: 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 2022-09-16 15:08 GMT, Maxime Devos : > > > On 16-09-2022 14:35, 路辉 wrote: >> > > > + (if tests? > + (apply invoke "make" > + ;; "V=1" > + "SKIP_KNOWN_BUGS=1" > + "SKIP_INTERNET_TESTS=1" > + "check" make-flags) > + #t))) > > Can be simplified to > > (when tests? > (apply invoke "make" > ;; "V=1" > "SKIP_KNOWN_BUGS=1" > "SKIP_INTERNET_TESTS=1" > "check" make-flags)) > > > + `(#:tests? (if ,(%current-target-system) #f #t) > > That's the default, no need to mention it again here. > > + #:make-flags > + (let ((target ,(%current-target-system))) > + (if target > + (list (string-append "CROSS_COMPILE=" target "-")) > + (list))) > > Can be simplified: > > #:make-flags > ,(let ((target ,(%current-target-system))) > (if target > #~(list (string-append "CROSS_COMPILE=" ,target)) > #~'())) > > (the #~ makes the phasing more explicit, if you go for that, I recommend > turning the arguments into (arguments (list #:phases #~(modify-phases > ...) #:make-flags ...)), instead of using ` / , , to remain consistent.) > > Greetings, > Maxime > new patch vvvv From abb215e6dbee73fefc32dbfd13cf153b028bcf93 Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Fri, 16 Sep 2022 18:34:59 +0800 Subject: [PATCH] gnu: busybox: fix the cross build. * gnu/packages/busybox.scm (busybox): fix cross build --- gnu/packages/busybox.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 4468d71088..4601205f8b 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice +;;; Copyright © 2022 LuHui ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,8 +46,9 @@ (define-public busybox "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-before 'configure 'disable-timestamps (lambda _ (setenv "KCONFIG_NOTIMESTAMP" "1"))) @@ -65,7 +67,7 @@ (define-public busybox (("# CONFIG_INSTALL_NO_USR is not set") "CONFIG_INSTALL_NO_USR=y")))) (replace 'check - (lambda* (#:key make-flags #:allow-other-keys) + (lambda* (#:key tests? make-flags #:allow-other-keys) (substitute* '("testsuite/du/du-s-works" "testsuite/du/du-works") (("/bin") "/etc")) ; there is no /bin but there is a /etc @@ -93,17 +95,23 @@ (define-public busybox (delete-file "testsuite/which/which-uses-default-path") (rmdir "testsuite/which") - (apply invoke "make" - ;; "V=1" - "SKIP_KNOWN_BUGS=1" - "SKIP_INTERNET_TESTS=1" - "check" make-flags))) + (when tests? + (apply invoke "make" + ;; "V=1" + "SKIP_KNOWN_BUGS=1" + "SKIP_INTERNET_TESTS=1" + "check" make-flags)))) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (apply invoke "make" (string-append "CONFIG_PREFIX=" out) - "install" make-flags))))))) + "install" make-flags))))) + #:make-flags + #~(let ((target #$(%current-target-system))) + (if target + (list (string-append "CROSS_COMPILE=" target "-")) + '())))) (native-inputs (list perl ; needed to generate the man pages (pod2man) ;; The following are needed by the tests. inetutils -- 2.37.3