From patchwork Thu Mar 31 07:28:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 38241 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 AF7B327BBEA; Thu, 31 Mar 2022 08:30: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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 78D2D27BBE9 for ; Thu, 31 Mar 2022 08:30:28 +0100 (BST) Received: from localhost ([::1]:54414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZpGF-0006nR-BO for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 03:30:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZpFs-0006l0-PV for guix-patches@gnu.org; Thu, 31 Mar 2022 03:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZpFs-0006A0-GL for guix-patches@gnu.org; Thu, 31 Mar 2022 03:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZpFs-0004Tb-9w for guix-patches@gnu.org; Thu, 31 Mar 2022 03:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54635] [PATCH v2 4/5] gnu: atomic-queue: Do not look for boost when cross-compiling. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Mar 2022 07:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner , Maxime Devos Cc: 54635@debbugs.gnu.org, Arun Isaac Received: via spool by 54635-submit@debbugs.gnu.org id=B54635.164871175917098 (code B ref 54635); Thu, 31 Mar 2022 07:30:04 +0000 Received: (at 54635) by debbugs.gnu.org; 31 Mar 2022 07:29:19 +0000 Received: from localhost ([127.0.0.1]:37644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZpF8-0004Rh-Id for submit@debbugs.gnu.org; Thu, 31 Mar 2022 03:29:18 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:51826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZpF2-0004RH-AW for 54635@debbugs.gnu.org; Thu, 31 Mar 2022 03:29:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=urVEWQh6U0Sizl7naOjWCvAZ/L4J1AfvavArtLdRRRU=; b=c8auhFRRP6d14xqDDnSsZK5E/a z6QZHoNzfSybM0wb/gKv2QgXsT9GvGMO1XbbOEuWi9OQjqwkiTETYN11fq8uReUe3XIhOI4IvlZAU OFr9fhiUFqktd32T8eIWFsPsDJZu4wjTuH9PZU0m/wznK7Y+xURi7ogzUw0HgyFZLc6pNZT3i/KJR 4aTmRQPT4EhsruotkFggvlikao6z+nY6glh5ArfvfL1KEL8LwuX/i0xXQmy4jkht4xTfaNj74GZmO dKaKRoAkV50tyl9bC96z1i/Xl0D6p9dl4w1R1PsRyCinb2OSgFy0hG5D9NLbEqRfq1JlmvYwmqKf2 DRRON7rQ==; Received: from [192.168.2.1] (port=47376 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1nZpEi-000V88-Al; Thu, 31 Mar 2022 12:58:52 +0530 From: Arun Isaac Date: Thu, 31 Mar 2022 12:58:48 +0530 Message-Id: <20220331072849.22417-4-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/cpp.scm (atomic-queue)[arguments]: When cross-compiling, add a do-not-check-for-boost phase. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index eb48902034..b0d4fdeb3e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1294,6 +1294,15 @@ (define-public atomic-queue `(#:configure-flags '("-Dbenchmarks=false") #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + `(;; boost is a test dependency. We don't run tests when + ;; cross-compiling. Disable all targets that depend on it. + (add-after 'unpack 'do-not-check-for-boost + (lambda _ + (substitute* "meson.build" + (("unit_test_framework = [^\n]*" all) + "unit_test_framework = disabler()"))))) + '()) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests?