From patchwork Fri Jul 8 15:58:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40604 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 287B427BBEA; Fri, 8 Jul 2022 18:22:26 +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 9B8CF27BBE9 for ; Fri, 8 Jul 2022 18:22:25 +0100 (BST) Received: from localhost ([::1]:49980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rgO-0001dP-F7 for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:22:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOh-0004o1-Cz for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOg-0007aq-UC for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOg-0001yY-Rn for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 1/5] gnu: llvm-8: Fix build with gcc-10. References: In-Reply-To: Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.16572959467462 (code B ref 56452); Fri, 08 Jul 2022 16:00:02 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:06 +0000 Received: from localhost ([127.0.0.1]:33055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNl-0001wA-F1 for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:06 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:47000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNj-0001vS-CB for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:03 -0400 Received: by mail-qk1-f172.google.com with SMTP id x22so3175545qkf.13 for <56452@debbugs.gnu.org>; Fri, 08 Jul 2022 08:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XaxBZFDH3AmpCYNs/uTcSnB+76E2+dYuT5AL4130hCQ=; b=JnTbFu09Xz5KQpdi5dqgA5z1L+694o5c9eEqqfSwJBiEe3TCiAE99C6RObGFEV1aAm IQLr+hX2MVKw1b0oXEbVsK+rVhLliuevkFfu2PBaba5b7JcqKP2y/7aQB5CGN77mvM0u EuoZ++6C7y+2OXqF9IMDjntttCZm8I7d0F3LQRq6xo0ymS4IhFb89Af15JrYeaHO8Gby czUsrFdXHyciTcFCdxf6zFutcoTNYsd/VtZx5G0qlxuj9NKF6bkxSlnTqVrxw+lk7G1a Id4feJr8vU07lgUb0s/nsdPDbeS29z750Gip6tI5t3FSt9JdfYcI17zXzJXrop9niO2S USlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XaxBZFDH3AmpCYNs/uTcSnB+76E2+dYuT5AL4130hCQ=; b=JV7fjUgklvxPNxJypOuS5GbrsxvPUROgrY7nuFs3u0GPVSeJuWibwPiIAwsXHCfd8h 7OqsOZEXdo3prW6wVofZ1Ld3rFv/UiKmqCjkm8qTM5tLC32bmzniqG6DKlTn1eZXD8N6 HOlEYW6/OzzAuQpK9Xwe/zMC+PzyXVxmvNCUnhIQnDVBR43vDvw4M8ooI1AFf69Orhys LqFi7b44is9SnVBgu8UzsrDl46EkhHbT54mClz5ABKQrnkDC5j3US2qOgvCmW8+XAXLV tCBp+2+kOxLUD7ayBQPDddMGX3lhch1b6vsqcU4Cq6Y7sJm78DZqy0rZ8qK52J+7ERjP ZWXg== X-Gm-Message-State: AJIora8bQf78mZ3E0FTAo7ylSyjUhq2ngpFMEN1XwC+mZ4VIaR3P/hej gMH1RLeSR6J48IzoufpsdBVez4NXoJSmpsw3 X-Google-Smtp-Source: AGRyM1vGcUkxP4/lSq4ejfYZ0VtMIPjmthOjsUJwPeD/y8ON57ibJoGcB1VYPXd+bcCiD0V3n/977A== X-Received: by 2002:a05:620a:2183:b0:6af:2a1f:42fb with SMTP id g3-20020a05620a218300b006af2a1f42fbmr2827802qka.360.1657295937395; Fri, 08 Jul 2022 08:58:57 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id z3-20020a05622a124300b00316a384447fsm28890911qtx.16.2022.07.08.08.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:56 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:48 +0000 Message-Id: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 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/patches/llvm-8-fix-build-with-gcc-10.patch: New file. * gnu/packages/llvm.scm (clang-8, clang-runtime-8): Update to 8.0.1. * gnu/packages/llvm.scm (llvm-8): Use patch and update to 8.0.1. * gnu/local.mk: Register patch. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 9 ++--- .../llvm-8-fix-build-with-gcc-10.patch | 34 +++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2516562ea4..0a5de26266 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1452,6 +1452,7 @@ dist_patch_DATA = \ %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ + %D%/packages/patches/llvm-8-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ffa156af15..f8320c4112 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -912,24 +912,25 @@ (define-public clang-toolchain-9 (define-public llvm-8 (package (inherit llvm-9) - (version "8.0.0") + (version "8.0.1") (source (origin (method url-fetch) (uri (llvm-uri "llvm" version)) (sha256 (base32 - "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8")))) + "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24")) + (patches (search-patches "llvm-8-fix-build-with-gcc-10.patch")))) (license license:ncsa))) (define-public clang-runtime-8 (clang-runtime-from-llvm llvm-8 - "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl" + "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi" '("clang-runtime-9-libsanitizer-mode-field.patch"))) (define-public clang-8 (clang-from-llvm llvm-8 clang-runtime-8 - "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08" + "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh" #:patches '("clang-8.0-libc-search-path.patch"))) (define-public clang-toolchain-8 diff --git a/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch b/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch new file mode 100644 index 0000000000..9b36cc772c --- /dev/null +++ b/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch @@ -0,0 +1,34 @@ +From b288d90b39f4b905c02092a9bfcfd6d78f99b191 Mon Sep 17 00:00:00 2001 +From: Than McIntosh +Date: Fri, 19 Jul 2019 13:13:54 +0000 +Subject: [PATCH] [NFC] include cstdint/string prior to using uint8_t/string + +Summary: include proper header prior to use of uint8_t typedef +and std::string. + +Subscribers: llvm-commits + +Reviewers: cherry + +Tags: #llvm + +Differential Revision: https://reviews.llvm.org/D64937 + +llvm-svn: 366572 +--- + llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h b/include/llvm/Demangle/MicrosoftDemangleNodes.h +index da9d9d5bfdc0c..3d47471f0ef0e 100644 +--- a/include/llvm/Demangle/MicrosoftDemangleNodes.h ++++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h +@@ -16,6 +16,8 @@ + #include "llvm/Demangle/DemangleConfig.h" + #include "llvm/Demangle/StringView.h" + #include ++#include ++#include + + namespace llvm { + namespace itanium_demangle { From patchwork Fri Jul 8 15:58:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40605 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 10B0227BBEA; Fri, 8 Jul 2022 18:22:57 +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 6DADD27BBE9 for ; Fri, 8 Jul 2022 18:22:56 +0100 (BST) Received: from localhost ([::1]:50804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rgt-0002CY-HG for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:22:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOi-0004p3-08 for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOh-0007cK-ID for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOh-0001yj-Fo for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 2/5] gnu: llvm-3.7, llvm-3.8: Fix build with gcc. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.16572959477475 (code B ref 56452); Fri, 08 Jul 2022 16:00:03 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:07 +0000 Received: from localhost ([127.0.0.1]:33058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNm-0001wJ-2K for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:06 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:44837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNj-0001vU-Li for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:04 -0400 Received: by mail-qt1-f172.google.com with SMTP id bs20so28002104qtb.11 for <56452@debbugs.gnu.org>; Fri, 08 Jul 2022 08:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UzmUGRlT+QgtBEsrtGmCDcsUXA7iQUAEk4omXP0bDVw=; b=jQgtjh17xE8DVk/7/Dp39DMvjdShse5zGRt+tykhYfGTnB/KDBk4g2yeDR50eprJPQ FJ2mORRytviKOg0otK/PsTshAPrMzW06XXntEYaqmWX4YDKSZu7t53L65wJztKzBSIvk QvJzadvnlAnSmy2pXu947hh/yRoMKWMd4lH433MVU+8drMb4Ssk9o7Glk/A3EuI5aWEu DVvSI+KBVfuMh3yt64q37NlrTDH68MoymCRUHOJ8prAgyO4bd7+HY3txLJi1EAGBGeeJ SF1L2VpcnVQv/+lYp9Kv1e5qDb//Q/oGqBud38wqTuzJH8WrxUa7vj8EmklJ0AC+ZJsx 59Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UzmUGRlT+QgtBEsrtGmCDcsUXA7iQUAEk4omXP0bDVw=; b=IZjTlwXySesNIwZOpeGfiX5IlKoWZhg9LXLMq1GNHURTza7hYF/Ugg8UQix4j9WGo5 LTfENWsN8A/y/WoZh6R7Y7AlwkPsUaDavjQJR0Ev4cVQFDBLBElNR30b27HbvlN2w0Ru Mp02jvPzRGOQu6ZdStuka1sL/kAUF9mXH5ntflPYpimkEKamijpabWBCIbudantgjK8/ mlCqMniKSFCDCeM21U3od+wiKJnuBm0MgEDwwBJ585J8Uw9wihaZZkSEzUpNQYhX0xo3 HyV01enmhPcfoNS9yVLmt27QYcoQyM4cxoLuyyenFJUUms1Xx8UkqZTN+xhtD88l80Wd ZMSg== X-Gm-Message-State: AJIora+4HqRuSLbNYM+jVQd+40Y/swy0Omk89hkb0ATESneUmcXNjmRN xVaQw1LoLPc8DysP84RNoNs+dW2RYaxP5mUD X-Google-Smtp-Source: AGRyM1sdy1KxTScKDvoYZYdSdgHiRwLQnQ22mh68HmR1wC9Oo7k92EJOdWeh1Z0tdjPzilnJYVgMxw== X-Received: by 2002:a05:6214:e85:b0:472:f6fd:3b48 with SMTP id hf5-20020a0562140e8500b00472f6fd3b48mr3131818qvb.54.1657295937869; Fri, 08 Jul 2022 08:58:57 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id z3-20020a05622a124300b00316a384447fsm28890911qtx.16.2022.07.08.08.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:57 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:49 +0000 Message-Id: <106f54f2d334a9a65286fc3ab96a2bc40cdb7f4f.1657294938.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> 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/patches/clang-runtime-3.7-fix-build-with-python3.patch, gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch: New files. * gnu/packages/llvm.scm (clang-runtime-3.7, llvm-3.7, llvm-3.8): Use patches. * gnu/local.mk: Register patches. --- gnu/local.mk | 2 ++ gnu/packages/llvm.scm | 9 ++++++--- ...lang-runtime-3.7-fix-build-with-python3.patch | 16 ++++++++++++++++ .../patches/llvm-3.x.1-fix-build-with-gcc.patch | 15 +++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch create mode 100644 gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a5de26266..d646a19f0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -955,6 +955,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \ + %D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \ %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \ %D%/packages/patches/classpath-aarch64-support.patch \ @@ -1452,6 +1453,7 @@ dist_patch_DATA = \ %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ + %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ %D%/packages/patches/llvm-8-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index f8320c4112..6b216ee78c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1036,7 +1036,8 @@ (define-public llvm-3.8 (uri (llvm-uri "llvm" version)) (sha256 (base32 - "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")))))) + "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf")) + (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch")))))) (define-public clang-runtime-3.8 (clang-runtime-from-llvm @@ -1060,7 +1061,8 @@ (define-public llvm-3.7 (uri (llvm-uri "llvm" version)) (sha256 (base32 - "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")))))) + "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")) + (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch")))))) (define-public clang-runtime-3.7 (clang-runtime-from-llvm @@ -1068,7 +1070,8 @@ (define-public clang-runtime-3.7 "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx" '("clang-runtime-asan-build-fixes.patch" "clang-runtime-3.8-libsanitizer-mode-field.patch" - "clang-3.5-libsanitizer-ustat-fix.patch"))) + "clang-3.5-libsanitizer-ustat-fix.patch" + "clang-runtime-3.7-fix-build-with-python3.patch"))) (define-public clang-3.7 (clang-from-llvm llvm-3.7 clang-runtime-3.7 diff --git a/gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch b/gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch new file mode 100644 index 0000000000..042f0e025a --- /dev/null +++ b/gnu/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch @@ -0,0 +1,16 @@ +Patch based on changes from +https://github.com/llvm/llvm-project/commit/c1fde4fa943fd03a3d40bc5d32b9e0045fd29208 + +diff --git a/lib/sanitizer_common/scripts/gen_dynamic_list.py b/lib/sanitizer_common/scripts/gen_dynamic_list.py +index 5ea2ca1..d7bc287 100755 +--- a/lib/sanitizer_common/scripts/gen_dynamic_list.py ++++ b/lib/sanitizer_common/scripts/gen_dynamic_list.py +@@ -100,7 +100,7 @@ def main(argv): + print('global:') + result.sort() + for f in result: +- print(' ' + f.encode('utf-8') + ';') ++ print(u' %s;' % f) + if args.version_list: + print('local:') + print(' *;') diff --git a/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch b/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch new file mode 100644 index 0000000000..75236c4069 --- /dev/null +++ b/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch @@ -0,0 +1,15 @@ +Patch from https://github.com/digego/extempore/issues/318 + +diff --git a/include/llvm/IR/ValueMap.h.orig b/include/llvm/IR/ValueMap.h +index ad518ac..d928f6a 100644 +--- a/include/llvm/IR/ValueMap.h ++++ b/include/llvm/IR/ValueMap.h +@@ -99,7 +99,7 @@ + explicit ValueMap(const ExtraData &Data, unsigned NumInitBuckets = 64) + : Map(NumInitBuckets), Data(Data) {} + +- bool hasMD() const { return MDMap; } ++ bool hasMD() const { return static_cast(MDMap); } + MDMapT &MD() { + if (!MDMap) + MDMap.reset(new MDMapT); From patchwork Fri Jul 8 15:58:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40601 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 1F61127BBEA; Fri, 8 Jul 2022 18:00:55 +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 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 D1BB327BBE9 for ; Fri, 8 Jul 2022 18:00:54 +0100 (BST) Received: from localhost ([::1]:53796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rLZ-0001F4-TT for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOi-0004q0-NK for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOi-0007dx-1g for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOh-0001ys-Vk for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 3/5] gnu: faust-2: Update to 2.41.1. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.16572959477481 (code B ref 56452); Fri, 08 Jul 2022 16:00:03 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:07 +0000 Received: from localhost ([127.0.0.1]:33060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNm-0001wV-T5 for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:07 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:43667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNk-0001vW-9v for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:04 -0400 Received: by mail-qt1-f181.google.com with SMTP id a26so424504qto.10 for <56452@debbugs.gnu.org>; Fri, 08 Jul 2022 08:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RxjM+nfr//MU6sycuRhB4eVPJK4q6eMf04/sAAzlp+I=; b=EKQL9irf7JvMWl1flt5UWgZZ6Qq331ZJeaqQsQR+MUuJW9vlndvwDi1pymnY3OzWJX eZEM/k3KpYZ+2v9Ops/CV4GRCx32Z6X+J5rLvn5XlMAeXrPFZeCzgQ3FK5s7+bl0Un+8 JQ80CrODRuyiZrOOhr7uNV0HSXTPZXZyhTMKC4BCgp6vINaSmjQILdYrW7qNsgrCvmDh raulHq1dsxRO+cQFVIDQFDgcsoA8lZEJt26UDIJ3iq34uGCHynz2tOZsUFy/Xus+Q7WJ YGPMCYczKRQ6/+CPWBV51uteq22g/mQhmFhPFYsz+33k33oB5IuvDxXrKPoFSZ7WOMWJ 8X9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RxjM+nfr//MU6sycuRhB4eVPJK4q6eMf04/sAAzlp+I=; b=kfZDf2zzA3vRkveEG0xmpOmFZUnlP+G9N9PYtUYh4tfTm1XD2E00UiYvx9ydzgKwXy 4xG99ejYVhmfbaSR32rcpiaJYJMS2njdxAfjV1VfWjr+5Tss3ViR2wIw2XRUMYs802+E 05lhXn5w8pcYiq/juAYkE4HnHjuAB3K1mydoHo0sxz5tSaYmtNyrqpkF87hPr9Hp1IwF 040+J1Ipl6C1TPGUlxO+TQxVYii12GHFLEwDC9olB/X1Oqgq0oYQfigS/2wfoovY6uBm 7EvVc/vN25A/3xg+020eV9O3/x1jMZyHG8g/0s2c2Zmx6/5gCSo9a8offRtrNPUc6nz2 nBqA== X-Gm-Message-State: AJIora8c8Xc37YDILtjEVDQOEpN9Cc8fB2JENYJxoRjon7s/1niFxTu9 fmG8oqX+vG+YwinKBqUjaPYJZdcFVxlqfSaI X-Google-Smtp-Source: AGRyM1uTC4po5DikkT/KSJ/FSoOXsOnCNcCuTEboWMDacH+xU8Iic2yRo201znzAIzHyOZHwiBVhUg== X-Received: by 2002:ac8:5a0e:0:b0:31d:3055:b6d6 with SMTP id n14-20020ac85a0e000000b0031d3055b6d6mr3503686qta.205.1657295938538; Fri, 08 Jul 2022 08:58:58 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id z3-20020a05622a124300b00316a384447fsm28890911qtx.16.2022.07.08.08.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:58 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:50 +0000 Message-Id: <550fca07d79d2f6cbb9643e59d034f8fa99f7e39.1657294938.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> 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/audio.scm (faust-2): Update to 2.41.1. [build-system]: Replace gnu-build-system with cmake-build-system. [native-inputs]: Replace llvm-3.8 with llvm. --- gnu/packages/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0922c74788..646f4af7a3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1952,7 +1952,7 @@ (define-public faust-0.9.67 (define-public faust-2 (package (inherit faust) - (version "2.5.23") + (version "2.41.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/grame-cncm/faust/" @@ -1960,15 +1960,15 @@ (define-public faust-2 "/faust-" version ".tar.gz")) (sha256 (base32 - "1yz5jnr76hh7rmxkpdi7gyrw1wp4gyqfpq8zyl97qdi5ga5gjznq")))) - (build-system gnu-build-system) + "0gk8ifxrbykq7ay0nvjns8fjryhp0wfhv5npgrl8xpgw9wfmw53j")))) + (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments faust) ((#:make-flags flags) `(list (string-append "prefix=" (assoc-ref %outputs "out")) "world")))) (native-inputs - `(("llvm" ,llvm-3.8) + `(("llvm" ,llvm) ("which" ,which) ("xxd" ,xxd) ("ctags" ,emacs-minimal) ; for ctags From patchwork Fri Jul 8 15:58:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40606 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 C3F3C27BBEA; Fri, 8 Jul 2022 18:23:36 +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 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 885EA27BBE9 for ; Fri, 8 Jul 2022 18:23:36 +0100 (BST) Received: from localhost ([::1]:51796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rhX-0002rQ-MF for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:23:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOj-0004qU-0S for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39170) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOi-0007iv-Ie for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOi-0001yz-H4 for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 4/5] gnu: LLVM, Clang, LLD: Update to 14.0.6. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.16572959507493 (code B ref 56452); Fri, 08 Jul 2022 16:00:04 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:10 +0000 Received: from localhost ([127.0.0.1]:33062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNq-0001wl-5u for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:10 -0400 Received: from mail-qk1-f175.google.com ([209.85.222.175]:36565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNl-0001vX-3W for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:05 -0400 Received: by mail-qk1-f175.google.com with SMTP id z12so16074886qki.3 for <56452@debbugs.gnu.org>; Fri, 08 Jul 2022 08:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zSWl4ANd8oTqBjyUtadCenvYrZtaKWjXuixc9T7bhIo=; b=xIMIlYkWlwI54ynSoR7u6J9zXJtMZoC6B6lpX3eYzqac4Di6mgFFZ6Zi9EQ7oH2Dpf z/p2OiqyFgmZ4ygx240dA7k+1kGSjTsMqmIlKd+Yof9941tADQv5K56jEiXiUXCzpmXX CcoFwcegy+yRWIDNLMJX8/SvPCpqYLyKZKvHGFsIoH7Y3cL4oFSYzga+9Oa/Q1pxbBWR XqQ3zECoHjeA4Dqf0IwE3V/NFgz144RJilS5MowF5ameqb8q6ENOjWMBmRPwgLwQmEPB 9E/h4tjY0Tof34ymJFHU0NGslL07JCnBWrJnGOzwDxGGI8nuEqaZpx2dAS8Zo4MSYRpM 7vww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zSWl4ANd8oTqBjyUtadCenvYrZtaKWjXuixc9T7bhIo=; b=IUlqCwx00tiSMzJr+pAlu1vyZOIp2Vjxmg3kP959SqocrLnq35oX971Ya94SohDTLK PBBk8EtMCorIpwL574uOAabiXFA8pLf3CDeCduDvcSgeqmyR72X5whXCIXLdM+135hJq UF38dS2mAN+6gid5MsoVcHzOnSTpLf0PAquwK8wI4HUfTHPzbBl1SG0Z8TdOZYnALO5G Vdd8+wLlWoGIIX/oPQQSOwIXNSYBhpGYUX+uLiyNewE7RELxoG9YuoK+J5vOQqbyb5i7 PUz5NfHN/6bt/t5nS/DFCK3we9/jCl8ZeYE4o3PyRsDg2F+lZ8CKR7ok12HrWMwp2EIV uQ/A== X-Gm-Message-State: AJIora/ANd+gbkckFcnHuG013c1hlDh/0tHi7aUYg/0zmSm66IpNZdgB lIdq6j1KJsZ1MJ9Wi091IhpaCJcI4bU9quct X-Google-Smtp-Source: AGRyM1u5nSqbNls+zRaLj/n+YsqqEcJ9+l7m5NJniMjjH94Kb8ryEdJnXze0lXjGUGPM6CRJF2yNQg== X-Received: by 2002:a05:620a:741:b0:6b5:57f9:6bda with SMTP id i1-20020a05620a074100b006b557f96bdamr2764711qki.205.1657295939262; Fri, 08 Jul 2022 08:58:59 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id z3-20020a05622a124300b00316a384447fsm28890911qtx.16.2022.07.08.08.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:58 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:51 +0000 Message-Id: X-Mailer: git-send-email 2.36.1 In-Reply-To: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> 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/llvm.scm (llvm-14, clang-14, lld-14): Update to 14.0.6. (%llvm-monorepo-hashes, %llvm-patches): Adjust accordingly. --- gnu/packages/llvm.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 6b216ee78c..67ca5ab5ea 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -543,10 +543,10 @@ (define (make-clang-toolchain clang) ("libc-static" ,glibc "static"))))) (define %llvm-monorepo-hashes - '(("14.0.5" . "1hdv020x4k5fp38hik3bxz8k2sr3gnyj9iym3yhjhwygzgwgxjh9"))) + '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx"))) (define %llvm-patches - '(("14.0.5" . ("clang-14.0-libc-search-path.patch")))) + '(("14.0.6" . ("clang-14.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -561,7 +561,7 @@ (define (llvm-monorepo version) (define-public llvm-14 (package (name "llvm") - (version "14.0.5") + (version "14.0.6") (source (llvm-monorepo version)) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) @@ -649,7 +649,7 @@ (define-public clang-14 (package-version llvm-14))) (sha256 (base32 - "1p9y5fbcw3ynb79nzyadirwdla03bq38k6d9nhv9x8z2q4ypsga4")))))) + "0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw")))))) (package (inherit template) (arguments @@ -1206,7 +1206,7 @@ (define-public libunwind-headers (define-public lld-14 (package (name "lld") - (version "14.0.5") + (version "14.0.6") (source (llvm-monorepo version)) (build-system cmake-build-system) (inputs From patchwork Fri Jul 8 15:58:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 40602 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 ADFBD27BBEA; Fri, 8 Jul 2022 18:01:59 +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 0DF1C27BBE9 for ; Fri, 8 Jul 2022 18:01:59 +0100 (BST) Received: from localhost ([::1]:54576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9rMc-0001ne-5r for patchwork@mira.cbaines.net; Fri, 08 Jul 2022 13:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qOj-0004rN-Gg for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qOj-0007mh-24 for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o9qOi-0001z8-WE for guix-patches@gnu.org; Fri, 08 Jul 2022 12:00:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56452] [PATCH 5/5] gnu: clang-toolchain-14: Build with libomp-14. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Jul 2022 16:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56452 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56452@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 56452-submit@debbugs.gnu.org id=B56452.16572959507499 (code B ref 56452); Fri, 08 Jul 2022 16:00:04 +0000 Received: (at 56452) by debbugs.gnu.org; 8 Jul 2022 15:59:10 +0000 Received: from localhost ([127.0.0.1]:33064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNq-0001wo-Cu for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:10 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:47009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qNl-0001vZ-El for 56452@debbugs.gnu.org; Fri, 08 Jul 2022 11:59:06 -0400 Received: by mail-qk1-f178.google.com with SMTP id x22so3175624qkf.13 for <56452@debbugs.gnu.org>; Fri, 08 Jul 2022 08:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jQiJeUp4xdqMAw4xvrld3hJVrttwsVShtc/eYRAUkhQ=; b=vUiVR2R0t3Z2AEnsMP4fs8X1BCp2OSgDnOUQvVmcXElPA+30FUAZsnkrzj0nQ/6hZS UE5FdOX6UeH4iBQ7bnu5piw0UQxi02L4dyskhYKRHvV7EcGOoiRcO9xl2cN6+/hlCPLA Z50N2EO7Q/x9larnkRmRmHoGCJngujpOWAHTj2UadKCZeQecQNiOTXhj+OOvzGXx8lTv fVSe7O1NM17uT8aQ2LMKloO+W6yCAsqKuJDE1VGQCwzpdNe1cHDn04rnNeswWKrRbzbo Fic+fF60s38uhqJ+ibf5CWr8hh4hsjpZztg0nkrILtUctzINIWcRkfDilaPyteHMZ/nq b7nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jQiJeUp4xdqMAw4xvrld3hJVrttwsVShtc/eYRAUkhQ=; b=NgiS/KNMB/nMmMff/I2silJteFtsHsdsojo8aZo5M+vPSkAWcX5uqygaBAsYARHS8x TG46SIwf1CRSZWA2VwIimSlYYw8vsE1hQDmLdH8Wz86n0hKQrfWp+MNVzQS5mIhwPCb4 HssYtWzvUYXS4LeHC6l2gU/0rpa7I+/wERgWwe3pNXaU2x0pDJDW49xTXtCwANkcNM+y +fb5cg9eg+hjO4r1LyTAgLw3ac7qoCpM4YouvGE74VBnzcHS6M3aWmPdgKlsAO9I5fPY 6iUg25bKVYDCdgEYNSmfhTj6lvOwg4w12Sg1+48XuI38zi8KNACKkqSBOGPsg9JBU9wJ eUIg== X-Gm-Message-State: AJIora8tJop20/LDKsZs5aaAIy0zGC0fYwppQ2fyUpg5QajeOcMLwt4Y 4vsJq7QCyWO3hKBkGngQM796JnP/iiOWQIQg X-Google-Smtp-Source: AGRyM1vq4TEtsCHhijtqw+uMMKD+mMJCfOIOohaz2okuvpe1SpUYo0efiYobyYjaPdOFypFT2PDHFQ== X-Received: by 2002:a05:620a:1a9f:b0:6af:2348:ad95 with SMTP id bl31-20020a05620a1a9f00b006af2348ad95mr2804012qkb.526.1657295939715; Fri, 08 Jul 2022 08:58:59 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id z3-20020a05622a124300b00316a384447fsm28890911qtx.16.2022.07.08.08.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:58:59 -0700 (PDT) From: Greg Hogan Date: Fri, 8 Jul 2022 15:58:52 +0000 Message-Id: <50d9574341a83c7de317befb05a3d6e1da17183d.1657294938.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> 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/llvm.scm (libomp-14): New variable. (libomp-13): Inherit from libomp-14. (libomp): Define as libomp-13. (make-clang-toolchain): Parameterize libomp. (clang-toolchain-14): Use libomp-14. --- gnu/packages/llvm.scm | 109 +++++++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 39 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 67ca5ab5ea..5a2f411eb2 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -485,7 +485,7 @@ (define (clang-properties version) "znver3") '()))))) -(define (make-clang-toolchain clang) +(define* (make-clang-toolchain clang #:optional (libomp libomp-13)) (package (name (string-append (package-name clang) "-toolchain")) (version (package-version clang)) @@ -660,8 +660,50 @@ (define-public clang-14 (lambda _ (chdir "clang")))))))))) +(define-public libomp-14 + (package + (name "libomp") + (version "14.0.6") + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "07zby3gwy5c8jssabrhjk3nsxlwipnm6sk4dsvck1l5d0br1ywsg")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (build-system cmake-build-system) + ;; XXX: Note this gets built with GCC because building with Clang itself + ;; fails (missing , even when libcxx is added as an input.) + (arguments + (list + #:configure-flags #~(list "-DLIBOMP_USE_HWLOC=ON" + "-DOPENMP_TEST_C_COMPILER=clang" + "-DOPENMP_TEST_CXX_COMPILER=clang++") + #:test-target "check-libomp" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source-and-install-license + (lambda _ + (chdir #$(string-append "../openmp-" version ".src")) + (install-file "LICENSE.TXT" + (string-append #$output "/share/doc"))))))) + (native-inputs + (list clang-14 llvm-14 perl pkg-config python)) + (inputs + (list `(,hwloc "lib"))) + (home-page "https://openmp.llvm.org") + (synopsis "OpenMP run-time support library") + (description + "This package provides the run-time support library developed by the LLVM +project for the OpenMP multi-theaded programming extension. This package +notably provides @file{libgomp.so}, which is has a binary interface compatible +with that of libgomp, the GNU Offloading and Multi Processing Library.") + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url) + (upstream-name . "openmp"))) + (license license:expat))) + (define-public clang-toolchain-14 - (make-clang-toolchain clang-14)) + (make-clang-toolchain clang-14 libomp-14)) (define-public llvm-13 (package @@ -699,6 +741,31 @@ (define-public clang-13 (base32 "1l4jjdqfl9hrh0fwzv27hc263zc6x61h09vs4ni3yla8i1cwhayc"))))) +(define-public libomp-13 + (package + (inherit libomp-14) + (version "13.0.1") + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "0kvbr4j6ldpssiv7chgqra5y77n7jwbyxlwcl7z32v31f49jcybb")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (arguments + '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" + "-DOPENMP_TEST_C_COMPILER=clang" + "-DOPENMP_TEST_CXX_COMPILER=clang++" + + ;; Work around faulty target detection, fixed in 14: + ;; https://github.com/llvm/llvm-project/issues/52910 + "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF") + #:test-target "check-libomp")) + (native-inputs + (modify-inputs (package-native-inputs libomp-14) + (replace "clang" clang-13) + (replace "llvm" llvm-13))))) + (define-public clang-toolchain-13 (make-clang-toolchain clang-13)) @@ -1515,43 +1582,7 @@ (define-public libclc ;; Apache license 2.0 with LLVM exception (license license:asl2.0))) -(define-public libomp - (package - (name "libomp") - (version "13.0.1") - (source (origin - (method url-fetch) - (uri (llvm-uri "openmp" version)) - (sha256 - (base32 - "0kvbr4j6ldpssiv7chgqra5y77n7jwbyxlwcl7z32v31f49jcybb")) - (file-name (string-append "libomp-" version ".tar.xz")))) - (build-system cmake-build-system) - ;; XXX: Note this gets built with GCC because building with Clang itself - ;; fails (missing , even when libcxx is added as an input.) - (arguments - '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" - "-DOPENMP_TEST_C_COMPILER=clang" - "-DOPENMP_TEST_CXX_COMPILER=clang++" - - ;; Work around faulty target detection, fixed in 14: - ;; https://github.com/llvm/llvm-project/issues/52910 - "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF") - #:test-target "check-libomp")) - (native-inputs - (list clang llvm perl pkg-config python)) - (inputs - (list `(,hwloc "lib"))) - (home-page "https://openmp.llvm.org") - (synopsis "OpenMP run-time support library") - (description - "This package provides the run-time support library developed by the LLVM -project for the OpenMP multi-theaded programming extension. This package -notably provides @file{libgomp.so}, which is has a binary interface compatible -with that of libgomp, the GNU Offloading and Multi Processing Library.") - (properties `((release-monitoring-url . ,%llvm-release-monitoring-url) - (upstream-name . "openmp"))) - (license license:expat))) +(define-public libomp libomp-13) (define-public python-llvmlite (package