From patchwork Fri Sep 16 12:35:04 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: 42665 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 5784B27BBEA; Fri, 16 Sep 2022 13:36:10 +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 D85BF27BBE9 for ; Fri, 16 Sep 2022 13:36:09 +0100 (BST) Received: from localhost ([::1]:49824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZAZl-0001sd-2i for patchwork@mira.cbaines.net; Fri, 16 Sep 2022 08:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZAZe-0001s8-AU for guix-patches@gnu.org; Fri, 16 Sep 2022 08:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZAZe-0001z0-23 for guix-patches@gnu.org; Fri, 16 Sep 2022 08:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZAZd-0005xi-T1 for guix-patches@gnu.org; Fri, 16 Sep 2022 08:36:01 -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 12:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57857 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57857@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.166333171022848 (code B ref -1); Fri, 16 Sep 2022 12:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2022 12:35:10 +0000 Received: from localhost ([127.0.0.1]:42053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZAYn-0005wR-W1 for submit@debbugs.gnu.org; Fri, 16 Sep 2022 08:35:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:33954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZAYn-0005wL-6V for submit@debbugs.gnu.org; Fri, 16 Sep 2022 08:35:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZAYn-0001Vl-1E for guix-patches@gnu.org; Fri, 16 Sep 2022 08:35:09 -0400 Received: from mail-yb1-xb44.google.com ([2607:f8b0:4864:20::b44]:42984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZAYl-0001Zu-B7 for guix-patches@gnu.org; Fri, 16 Sep 2022 08:35:08 -0400 Received: by mail-yb1-xb44.google.com with SMTP id 130so32314794ybz.9 for ; Fri, 16 Sep 2022 05:35:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=K527FUc5VZ1vqEFrBapW3Kn9iQx8qTFx5xUMpMHvqAs=; b=UBo5czB3QolRnzSmhSSTpimXgk+eT0WmWgWd/0e2zdZW7wgK6H+XDP/xiPRf5V14OJ FIYI+sRb2A7mri5rs4i0tj51u7u1QjCCV/qIc/O0EdZrybjqQzbwx+YD7qiXhkpSNOJa QMh+m+KCJoaABCo/VF9VQ8YvU1jHirki1/tFxjFWYjY2ZBVOIxl8jgeN3KqqTWRezWCx ByTKV7D2U0HLQkHyfPvWdYw20tOUBmdQ92mhG6F90UfYqvdwnXVTWUkPej0Ch4NCjFOj HdUDgscinKJlYfzTwxQYziVwgqlYbS/ZTmtblC25XMcdvijEc9OBUVdPCmysLYq5I6Gu oQoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=K527FUc5VZ1vqEFrBapW3Kn9iQx8qTFx5xUMpMHvqAs=; b=j8WSVLHM9FgKMxC2ZMWQc46UUh+NYHgglz5O3D1TFgfRn0ptQpMOQhRO0/kGZ20VIP QI46zJiYk57E3Tm7lUuK0lekdlFeya1xL/lafGdhzJpr0EeKny34FsWhw6iGiy+k1/W5 4RtJYWrVEHhYwfbF20lgNgxuwde83IesI06a+DBIfkETSTtWZz3HLWBlWsNDa58aiDZ2 p8rrmw0T3PucvZKo0xRCD2Gog6MPOc1aqwbTztpTkzsh8Bp361EKwTw8PhbSE9fBwpuV 0xE9fSNDSvsPG1sFlXbZtXtWjn5yuH6vtEqMEY+8w4jXBdTPLGjhrsHmSxy5lR2a3LEs cafw== X-Gm-Message-State: ACrzQf0kgWbNRaOM4g5EsPzag1XyzuNdB/TokhjbpPHUYQ67MglfmneQ kwgyksFAsqzmuC84oSVF4kO5hsD9KwwtLSDgfA+zNfKAv/8MldNg X-Google-Smtp-Source: AMsMyM64CXsQrnJ9zCJJgcrjHyUsz/siRmUOYAoxlRdn4f4En4wGjZenJGxAKL+Of5Hzjk9UpiB3jku8GLHxFg9ruQo= X-Received: by 2002:a05:6902:1605:b0:6af:13b8:f8a5 with SMTP id bw5-20020a056902160500b006af13b8f8a5mr3899107ybb.501.1663331705548; Fri, 16 Sep 2022 05:35:05 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a0d:d0c6:0:0:0:0:0 with HTTP; Fri, 16 Sep 2022 05:35:04 -0700 (PDT) From: =?utf-8?b?6Lev6L6J?= Date: Fri, 16 Sep 2022 12:35:04 +0000 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::b44; envelope-from=luhux76@gmail.com; helo=mail-yb1-xb44.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From 17b77a70781dc5f0e2f54516748081e51da36a14 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 | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 4468d71088..600e94f5b4 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,14 @@ (define-public busybox "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases + `(#:tests? (if ,(%current-target-system) #f #t) + #:make-flags + (let ((target ,(%current-target-system))) + (if target + (list (string-append "CROSS_COMPILE=" target "-")) + (list))) + #:phases + (modify-phases %standard-phases (add-before 'configure 'disable-timestamps (lambda _ (setenv "KCONFIG_NOTIMESTAMP" "1"))) @@ -65,7 +72,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,11 +100,13 @@ (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))) + (if tests? + (apply invoke "make" + ;; "V=1" + "SKIP_KNOWN_BUGS=1" + "SKIP_INTERNET_TESTS=1" + "check" make-flags) + #t))) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- 2.37.3