From unknown Wed Jun 18 23:08:07 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#56452 <56452@debbugs.gnu.org> To: bug#56452 <56452@debbugs.gnu.org> Subject: Status: [PATCH 0/5] Fix and update LLVM and clang-toolchain. Reply-To: bug#56452 <56452@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:08:07 +0000 retitle 56452 [PATCH 0/5] Fix and update LLVM and clang-toolchain. reassign 56452 guix-patches submitter 56452 Greg Hogan severity 56452 normal tag 56452 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 11:57:47 2022 Received: (at submit) by debbugs.gnu.org; 8 Jul 2022 15:57:47 +0000 Received: from localhost ([127.0.0.1]:33042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qMV-0001t8-1K for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:57:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:46588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o9qMS-0001t0-Q6 for submit@debbugs.gnu.org; Fri, 08 Jul 2022 11:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9qMS-0008VZ-Dm for guix-patches@gnu.org; Fri, 08 Jul 2022 11:57:44 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:36404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9qMP-0005Qf-Vx for guix-patches@gnu.org; Fri, 08 Jul 2022 11:57:44 -0400 Received: by mail-qt1-x82f.google.com with SMTP id k14so27968813qtm.3 for ; Fri, 08 Jul 2022 08:57:41 -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=9rTlN1D+TWHS29khlP4ULKXCEiGwFQGI3k/6+OpDTlo=; b=wdUKu33gwO3FVYk6mZBMzS/aA1LhWGAKuFB6wTf9pX3BRXp3GFO78epLufl5G2F8SJ 8ZiQPqRPHSfUJ8qP/CHbe0wzmgpDnVwZjo4pGu33mmoJqQu0vjiB/I7hhL3bevRTKOqU ZggapseQAcgw0PLPFEiGuf43jAHkihAvwpHA09LLwUxJSMn4btYeNW1UR/dPc0WGTLIv ixdmK77dKl9/EH7DKnfvqggXycq3Oa90kQS7D9ZQDXmv5GtZrHm/KP4S+6++SRF/4CKe SYwyLtH/h+Fn1Hg8FVJavjaYOgAiwN/b5HZQJTSm+wK4GgaM1bZ5o8IuO1ENslLC2XmD stzw== 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=9rTlN1D+TWHS29khlP4ULKXCEiGwFQGI3k/6+OpDTlo=; b=Qlen5gBPcMD733HGjlaY7+RctRl5Jb1zJOXz20uwC8zk49b/rkR3z6psjfwyH/on++ tbfR2t3hDz09cElfkL6ezqGD9ij0tlWfh9oj6Jq4Mq6hyU5VAdJpxNaKLapdHe3h7Vm8 LkI5HLkv2QOksehwWmgbCgHSzVi8rjfJSav4k2uR5IRhJ6O0PXrIPFGlg4QH+VwOSqbi j7uucDyCHoa0EciEYTi02YwKpg/Q5ds5IIgu54julLnyA6lL4gScGbgqqQb6vzlnMbp4 Uy3PrJ8B90GJ1oA8qYlEvDcaOTDVpvYFEBmXIluNIZQEh/bkFrB0spxKvM5l/PdY7GoT 7KOg== X-Gm-Message-State: AJIora9cPMAy8VQD8V6Myq+W6xDFxI0nPyEd0sP+y9ct+wrEakZNlssx Dg6HN1wV195uA5G1l4WE4mVatg7bcDd8i1TK X-Google-Smtp-Source: AGRyM1tuALuGSBbe+knXU7zbcOm61LoX0ZWQuemPxRC1kb0ZwJjLuY6IDgTO/JtvuMPtg/2N1rotjA== X-Received: by 2002:a05:6214:1c88:b0:472:a7e2:bef4 with SMTP id ib8-20020a0562141c8800b00472a7e2bef4mr3367450qvb.32.1657295859763; Fri, 08 Jul 2022 08:57:39 -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 a21-20020a05620a16d500b006a7502d0070sm32572815qkn.21.2022.07.08.08.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:57:38 -0700 (PDT) From: Greg Hogan To: guix-patches@gnu.org Subject: [PATCH 0/5] Fix and update LLVM and clang-toolchain. Date: Fri, 8 Jul 2022 15:57:30 +0000 Message-Id: X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::82f; envelope-from=code@greghogan.com; helo=mail-qt1-x82f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This patchset updates and fixes the builds of llvm-3.7, llvm-3.8, and llvm-8 and also updates llvm-14. The only failing depedent package is beignet, which has failed to build since last year's replacement of ocl-icd with opencl-icd-loader. beignet has no dependents and was last updated in 2017. By building clang-toolchain with a libomp built with the same version of llvm we remove the additional copy of llvm and reduce the size of the closure from 1330.9 MB to 1156 MB. If this is accepted I would look to submit a follow-on patchset adding libomp varients for clang-toolchain-12 and earlier. $ guix size clang-toolchain@14 | grep 'clang\|llvm\|libomp' /gnu/store/rhs2ws9xqx5ln44ix2kvjmmjv3jg5aw1-clang-14.0.5 886.1 215.6 16.2% /gnu/store/pkcw25plv6310pmmm7yi276fzzpnl6zq-llvm-14.0.5 257.2 185.2 13.9% /gnu/store/579xrf7vz85ynjlk62njaczgnayam1ar-llvm-13.0.1 247.1 175.0 13.2% /gnu/store/p0spbhzkk7wa3phiyk126n1kkfdsnmw9-clang-runtime-14.0.5 227.9 31.6 2.4% /gnu/store/js2yvkq2ki2zbl166g2mfa53qlrilxhn-libomp-13.0.1 253.9 1.8 0.1% /gnu/store/ahr3mcg1l1nml67x4i1znws25ph84bb2-clang-toolchain-14.0.5 1330.9 0.3 0.0% $ ./pre-inst-env guix size clang-toolchain@14 | grep 'clang\|llvm\|libomp' /gnu/store/hcypy6mb3v19a58hvaf265283jgd37mm-clang-14.0.6 886.1 215.6 18.6% /gnu/store/0ip696hw07p8rmwyqks0slm642mhdzfh-llvm-14.0.6 257.2 185.2 16.0% /gnu/store/bckl8q1wra5k0cgwfiyb2syay556gwjr-clang-runtime-14.0.6 227.9 31.6 2.7% /gnu/store/rpk14gkhav3mrcf5wppyc77yd2jh5syi-libomp-14.0.6 264.2 1.9 0.2% /gnu/store/bynhq99qdd71n1v4y52x533bxghz6i1x-clang-toolchain-14.0.6 1156.0 0.3 0.0% Greg Hogan (5): gnu: llvm-8: Fix build with gcc-10. gnu: llvm-3.7, llvm-3.8: Fix build with gcc. gnu: faust-2: Update to 2.41.1. gnu: LLVM, Clang, LLD: Update to 14.0.6. gnu: clang-toolchain-14: Build with libomp-14. gnu/local.mk | 3 + gnu/packages/audio.scm | 8 +- gnu/packages/llvm.scm | 134 +++++++++++------- ...g-runtime-3.7-fix-build-with-python3.patch | 16 +++ .../llvm-3.x.1-fix-build-with-gcc.patch | 15 ++ .../llvm-8-fix-build-with-gcc-10.patch | 34 +++++ 6 files changed, 155 insertions(+), 55 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 create mode 100644 gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 11:59:06 2022 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 To: 56452@debbugs.gnu.org Subject: [PATCH 1/5] gnu: llvm-8: Fix build with gcc-10. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 { -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 11:59:06 2022 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 To: 56452@debbugs.gnu.org Subject: [PATCH 2/5] gnu: llvm-3.7, llvm-3.8: Fix build with gcc. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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); -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 11:59:07 2022 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 To: 56452@debbugs.gnu.org Subject: [PATCH 3/5] gnu: faust-2: Update to 2.41.1. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 11:59:10 2022 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 To: 56452@debbugs.gnu.org Subject: [PATCH 4/5] gnu: LLVM, Clang, LLD: Update to 14.0.6. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 08 11:59:10 2022 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 To: 56452@debbugs.gnu.org Subject: [PATCH 5/5] gnu: clang-toolchain-14: Build with libomp-14. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 11 18:06:15 2022 Received: (at 56452) by debbugs.gnu.org; 11 Jul 2022 22:06:15 +0000 Received: from localhost ([127.0.0.1]:41155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oB1Xj-0004Va-C1 for submit@debbugs.gnu.org; Mon, 11 Jul 2022 18:06:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oB1Xi-0004VP-7k for 56452@debbugs.gnu.org; Mon, 11 Jul 2022 18:06:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB1Xc-0003OQ-Sm; Mon, 11 Jul 2022 18:06:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=4G5FaFoC28PNVOfSFDVCsvuG1Go9sVE23n08pMW06bU=; b=ILP9Uh2Wsp6uJYlmNng2 2Zir90YhfejXfYZ43149KrJPG+lexI7aZjey027iOZuTS40BgCVe6mY+uz1I98ntKhaPMyR0JbC2X ztBBc6YUf8OF2bhJmZ7Xk8ADjeQ1hTizLu7aLHlsI91Mg9qmuSR2PBxAecMFmgYajrWMGi6ZI4SnB giFGT1L90BnrN2pMUboXBhRjk3AjhwJsAbItHP7Ne8AOnVqSpiuNPqhyvm6yiX/k+rgHxp8tajsH6 v2qR/772dkNdwTmgs/6BnTkJKJ25DNY4iumUok2Hd0YlfglnZkn+c91zL4xWEjcneJSbWJxsQWbm6 mBloHuCFBxJlkA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49692 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB1Xc-0007b1-3z; Mon, 11 Jul 2022 18:06:08 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Greg Hogan Subject: Re: bug#56452: [PATCH 0/5] Fix and update LLVM and clang-toolchain. References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> <550fca07d79d2f6cbb9643e59d034f8fa99f7e39.1657294938.git.code@greghogan.com> Date: Tue, 12 Jul 2022 00:06:05 +0200 In-Reply-To: <550fca07d79d2f6cbb9643e59d034f8fa99f7e39.1657294938.git.code@greghogan.com> (Greg Hogan's message of "Fri, 8 Jul 2022 15:58:50 +0000") Message-ID: <87ilo3i9te.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56452 Cc: 56452@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Greg Hogan skribis: > * 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. It fails to build for me, like so: --8<---------------cut here---------------start------------->8--- Consolidate compiler generated dependencies of target faustmachinestatic make[4]: Leaving directory '/tmp/guix-build-faust-2.41.1.drv-0/faust-2.41.1= /build/faustdir' [100%] Built target faustmachinestatic make[3]: Leaving directory '/tmp/guix-build-faust-2.41.1.drv-0/faust-2.41.1= /build/faustdir' Install the project... -- Install configuration: "Release" CMake Error at cmake_install.cmake:60 (file): file cannot create directory: /usr/local/bin. Maybe need administrative privileges. make[2]: *** [Makefile:103: install] Error 1 make[2]: Leaving directory '/tmp/guix-build-faust-2.41.1.drv-0/faust-2.41.1= /build/faustdir' make[1]: *** [Makefile:333: install] Error 2 make[1]: Leaving directory '/tmp/guix-build-faust-2.41.1.drv-0/faust-2.41.1= /build' make: *** [Makefile:200: install] Error 2 error: in phase 'install': uncaught exception: %exception #<&invoke-error program: "make" arguments: ("install" "prefix=3D= /gnu/store/bxzj1inf7y4d4y7gxdmzk24zi1xgwifv-faust-2.41.1" "world") exit-sta= tus: 2 term-signal: #f stop-signal: #f>=20 phase `install' failed after 4.8 seconds command "make" "install" "prefix=3D/gnu/store/bxzj1inf7y4d4y7gxdmzk24zi1xgw= ifv-faust-2.41.1" "world" failed with status 2 --8<---------------cut here---------------end--------------->8--- Could you take a look? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 11 19:17:39 2022 Received: (at 56452) by debbugs.gnu.org; 11 Jul 2022 23:17:39 +0000 Received: from localhost ([127.0.0.1]:41204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oB2ep-0006Io-0R for submit@debbugs.gnu.org; Mon, 11 Jul 2022 19:17:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oB2en-0006Ic-QU for 56452@debbugs.gnu.org; Mon, 11 Jul 2022 19:17:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB2eX-0004WS-Jv; Mon, 11 Jul 2022 19:17:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=vT7Hv95qMa3sgeS+on2bunT7ckMPGl/VaePCISm4CZs=; b=j/rIgqD8DfhVON3F/+El nDiRiwe7cjCzK2q6TIik4v+LBspj6lMLI/tC2MCWgupoW3gbSnReb/mK/zABjhvhgg4eAuNsGUsdq rDUBC6/ToKrahZw5Rmmqy/8WqeDHybfGWle0sdwcc6jqwKsPZIXMQi4mfDbd0F/uUQDthatwb+Bu+ iht9jY0s7aXSfvmtKKcjkpEmlzZXxv8Fvyq1uyrqja/xYQM9fjYpq/sz+1njJtM+FS75BpoeBGj9l Lx6cXf6D8oPDuXFckyxcd1GC5YeI4yaCaNdY8IfvcaQDqsY9UtKmkAv8xs9ZM3WWyDVDDmL6NR53v 92+RxEdLOs7l2A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:59822 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB2eX-0007N7-6Z; Mon, 11 Jul 2022 19:17:21 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Greg Hogan Subject: Re: bug#56452: [PATCH 0/5] Fix and update LLVM and clang-toolchain. References: Date: Tue, 12 Jul 2022 01:17:19 +0200 In-Reply-To: (Greg Hogan's message of "Fri, 8 Jul 2022 15:57:30 +0000") Message-ID: <878rozi6io.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56452 Cc: 56452@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Greg Hogan skribis: > This patchset updates and fixes the builds of llvm-3.7, llvm-3.8, and > llvm-8 and also updates llvm-14. Yay! > The only failing depedent package is beignet, which has failed to build > since last year's replacement of ocl-icd with opencl-icd-loader. beignet > has no dependents and was last updated in 2017. > > By building clang-toolchain with a libomp built with the same version of > llvm we remove the additional copy of llvm and reduce the size of the > closure from 1330.9 MB to 1156 MB. It=E2=80=99s still terrible, but it=E2=80=99s an improvement. > If this is accepted I would look to submit a follow-on patchset adding > libomp varients for clang-toolchain-12 and earlier. Sounds good. > gnu: llvm-8: Fix build with gcc-10. > gnu: llvm-3.7, llvm-3.8: Fix build with gcc. > gnu: faust-2: Update to 2.41.1. > gnu: LLVM, Clang, LLD: Update to 14.0.6. > gnu: clang-toolchain-14: Build with libomp-14. Applied it all except the faust patch; let me know what to do with that one. Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 12 16:06:25 2022 Received: (at 56452) by debbugs.gnu.org; 12 Jul 2022 20:06:25 +0000 Received: from localhost ([127.0.0.1]:43681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBM9J-0005Mn-Gs for submit@debbugs.gnu.org; Tue, 12 Jul 2022 16:06:25 -0400 Received: from mail-il1-f177.google.com ([209.85.166.177]:34344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBM9I-0005MY-3w for 56452@debbugs.gnu.org; Tue, 12 Jul 2022 16:06:24 -0400 Received: by mail-il1-f177.google.com with SMTP id k1so5530013ilu.1 for <56452@debbugs.gnu.org>; Tue, 12 Jul 2022 13:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=y1MAPFL9rtW2SXCceYa+gVoZB5JhqxlQQq2frXWcLzI=; b=Q3O6leaDhucSsg+SYnJXeODQYURtPwSKMv2T81uEzeHqkngE70P/qGX196QopRlTCG 48O4ftYRaJuxWf6kMjfXA2bqfwghwahkQH+jV6L60m074WAjUWtNNiI3B3ICBwQgIBwJ wd14cMl88bMIrhh9+bkQkXoxVh19b1tOlpPcZgZsvNljBur7+k8OKfKX4Xb1oDLcZ7DT ziaCOoWWUno6i1iSiSCIcLO0+I/Q0mxcWB06zlkn8RRtYSMQ0XVQ+L8Ox9nI2A5iprXz FEHuANg8FAYQZL7rwW9I0W0bqGLEud7qsb8DC/YfwfQ5lJEEgGDaBfzLqt0MoDFq7YRQ kcOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=y1MAPFL9rtW2SXCceYa+gVoZB5JhqxlQQq2frXWcLzI=; b=26ByxFFvWT+JugVfZifI30prTXmNclXi/Y3vcTREqZB0cSaMKcRaVTp36FqhVfWuOC sucDX8cGx8mFrZqRgO5kAiK/aHEZ/5zZ3Z0zVmzaf3KlL0IkXcc8/OElii9E9rH3TWbD Qf+sbKfay8C/RLcmA+gB4wXUMrKMMYiIJJHHb5kP6pkM3STiomJwiffKty4k9ND8mx6T O5pgxJSY4iK9FyGCPLzKi7NF/pTPg3yrSeoSiZRK7YhUvFMklANLeURmexR/XXcpHPxV c+YQKGQsV84kLkNHYCGS11d6ozfwESJLIhWI2xrHOVJrhAtOqX4yqADiA2teYnm/qjeM 5jQw== X-Gm-Message-State: AJIora+TrC1JIiYckzRXGd98pGR2WavfmMtw+SX6nDXz7QI4ctGCrzsR LDb4dtLcySZoDLBkF4DRLuRxhjZA5p/ZuQj7vstAuQ== X-Google-Smtp-Source: AGRyM1u9DFgNM33OVJKGLPWPTWM5OE79yd5Oi0F5M9rYJ63nI6ZoiFjIu2icjrvqFlqHZPrWj9INKrrmcYJJ9beanEg= X-Received: by 2002:a05:6e02:178c:b0:2dc:2783:aac3 with SMTP id y12-20020a056e02178c00b002dc2783aac3mr13970421ilu.142.1657656378381; Tue, 12 Jul 2022 13:06:18 -0700 (PDT) MIME-Version: 1.0 References: <985ab84c845abce551a920787da67fc982a664bc.1657294938.git.code@greghogan.com> <550fca07d79d2f6cbb9643e59d034f8fa99f7e39.1657294938.git.code@greghogan.com> <87ilo3i9te.fsf_-_@gnu.org> In-Reply-To: <87ilo3i9te.fsf_-_@gnu.org> From: Greg Hogan Date: Tue, 12 Jul 2022 16:06:07 -0400 Message-ID: Subject: Re: bug#56452: [PATCH 0/5] Fix and update LLVM and clang-toolchain. To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Ricardo Wurmus , 56452@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Mon, Jul 11, 2022 at 6:06 PM Ludovic Court=C3=A8s wrote: > > Hi, > > Greg Hogan skribis: > > > * 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. > > It fails to build for me, [...] > > Could you take a look? > > Thanks, > Ludo=E2=80=99. Ludo', Thanks for the review! I failed to register that by switching the dependency from llvm-3.8 to llvm, the faust-2 build would no longer be initiated when building all dependencies of llvm-3.8. I have a patch to follow-up with git send-email. I have cc'd Ricardo since he looks to be both a user and maintainer of the faust packages. Greg From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 12 16:08:03 2022 Received: (at 56452) by debbugs.gnu.org; 12 Jul 2022 20:08:03 +0000 Received: from localhost ([127.0.0.1]:43689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBMAt-0005Pn-4D for submit@debbugs.gnu.org; Tue, 12 Jul 2022 16:08:03 -0400 Received: from mail-qv1-f46.google.com ([209.85.219.46]:35360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBMAr-0005P8-4t for 56452@debbugs.gnu.org; Tue, 12 Jul 2022 16:08:01 -0400 Received: by mail-qv1-f46.google.com with SMTP id l2so3367913qvt.2 for <56452@debbugs.gnu.org>; Tue, 12 Jul 2022 13:08:01 -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=eq8gRG6toUJZzM+x6VHHgta9dUQljwMc4Dm6jPYKJ0M=; b=hu/npWpk2iCzQ+QAOb8nfpwiHejoxmU9cM8+RghJITYJj66S0ady61IMGtQaKa3cnr 7Q0CapqSO77AdKi6kg+h5/Ms87MMD4RS8T7nkQSGNz0ehMlK86Bhc1B1AmmWgPYaE6Pl +NfOKRXqizfixuSyQIGfN9/n+lc2c7s2SFV5ZheBX4Wae0493DKx9hZNsfe3SxzmIBko aVXYmV8ZyxEEMJrTBGmCrPnMX62c1Waecs6My5Fhx1kjAdnaA1khi7u44V8UL1wr6Wc9 n89XZuyWu8JYeLPvCRVCBK+L8J7UxN0+4TCrVL/1xcPfanI++m8KIF+LMrDtMdfvOrzg 14ig== 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=eq8gRG6toUJZzM+x6VHHgta9dUQljwMc4Dm6jPYKJ0M=; b=kbO+Qs5jO471t8z8EmN3ZkNnKwXgkb+LGJr09MW+MP2lAUNlINKK7pFg2aXAdiRdbo FsaKcLl4TA2MR5wz6nJPWFZ+OJNsvHpwAYk/oX0DgBJw33iGYgK8gNoRiPjsDApCdA14 BYLYhDEQ0+gHV9OPgBDowZWtL+34WuLMXJF/K8uNZrXoTZYycY8AwSb/rqLMeS6iV4st I8RuyrzFpz6Yf0+sTVRA2Fi38HcNYNGuEK2N/58p1SmieEOSdfzoA1+HoYvbhEJyBTXa 3rij6Wmf9fZhyr+nJqCBwHF3CKEcFBtAhSn8ZrRlVGVfZNms12nVOl5sY4PE6Ub3Hv/V YqKQ== X-Gm-Message-State: AJIora8Nh913McCW1Iicxf0o2BDQkmcz4QQFdUj10JjXxRz7tWvJb1Az 1rijnu4FNoAscxOw34tYZBeWTLvcTKvMwIyl X-Google-Smtp-Source: AGRyM1sa4HeqOeXqVtzlijXaaeEofX+jZVVwu1cYQLab678HOFrllJhHkt7TMsha0bUH29dm10LBlA== X-Received: by 2002:a05:6214:1d29:b0:473:52fa:e550 with SMTP id f9-20020a0562141d2900b0047352fae550mr14668937qvd.38.1657656475420; Tue, 12 Jul 2022 13:07:55 -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 cq12-20020a05622a424c00b0031eb5fa4b50sm4194382qtb.39.2022.07.12.13.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 13:07:54 -0700 (PDT) From: Greg Hogan To: 56452@debbugs.gnu.org Subject: [PATCH v2] gnu: faust-2: Update to 2.41.1. Date: Tue, 12 Jul 2022 20:07:52 +0000 Message-Id: <1b69156c4538217f9c1233fd1247ef928b572806.1657656312.git.code@greghogan.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56452 Cc: Greg Hogan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/audio.scm (faust-2): Update to 2.41.1. [build-system]: Replace gnu-build-system with cmake-build-system. [arguments]<#:phases>: Invoke cmake directly to build the main package and invoke make directly to build ancillary tools. [native-inputs]: Replace llvm-3.8 with llvm. --- gnu/packages/audio.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0922c74788..db4c3af248 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,29 @@ (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")))) + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + ;; The upstream package uses make to run cmake during the build stage. + ;; Here we ignore the Makefile and call cmake directly. + (replace 'configure + (lambda _ + (chdir "build") + (invoke "cmake" "-C" "backends/all.cmake" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))))) + ;; The sound2faust tool would be built in the Makefile's "world" target + (add-after 'install 'sound2faust + (lambda _ + (chdir "../tools/sound2faust") + (setenv "PREFIX" (assoc-ref %outputs "out")) + (invoke "make") + (invoke "make" "install")))))) (native-inputs - `(("llvm" ,llvm-3.8) + `(("llvm" ,llvm) ("which" ,which) ("xxd" ,xxd) ("ctags" ,emacs-minimal) ; for ctags -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 12 18:19:56 2022 Received: (at 56452-done) by debbugs.gnu.org; 12 Jul 2022 22:19:56 +0000 Received: from localhost ([127.0.0.1]:43830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBOEW-0000UK-7H for submit@debbugs.gnu.org; Tue, 12 Jul 2022 18:19:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBOEU-0000U6-Ls for 56452-done@debbugs.gnu.org; Tue, 12 Jul 2022 18:19:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBOEL-0002iu-5M; Tue, 12 Jul 2022 18:19:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=lkxSdFi+DjknTohwu8AS6rGkh00onUxHTZIofvyYKSQ=; b=k+CdzE6sCNJt5jY9geJP qAFwzcHgb4/CARBAdwa1DR0BqevZiSvUu8zOUA84MC3Cxl9siI4kSsLuuskA2A2vVkhkCsjtxmCzc rzVUBJs6QtrT1s5bLSchaW98irCbkti7lFtz/3HQbIn2dg9eUKQ90Q4rFKMLnsADc5+MW4d7zt/5f eb09fojY2bFb36z4VEWxDatG9K0YD/NB7VH8zZIWOZ5HWZpVVIE27KGPmp1uFpFLx9JE5pdyLHwDu ENW+i/smRzAQxwotpsHqji+b8wvwWChB+LevRn9uc9GgsWC9M3vmwiS0zT52nRe3y27uiof7SS82v FtTpNVCfV5Fg/w==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:63839 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBOEK-0007DO-PJ; Tue, 12 Jul 2022 18:19:44 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Greg Hogan Subject: Re: bug#56452: [PATCH 0/5] Fix and update LLVM and clang-toolchain. References: <1b69156c4538217f9c1233fd1247ef928b572806.1657656312.git.code@greghogan.com> Date: Wed, 13 Jul 2022 00:19:43 +0200 In-Reply-To: <1b69156c4538217f9c1233fd1247ef928b572806.1657656312.git.code@greghogan.com> (Greg Hogan's message of "Tue, 12 Jul 2022 20:07:52 +0000") Message-ID: <87o7xuas8w.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56452-done Cc: 56452-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Greg Hogan skribis: > * gnu/packages/audio.scm (faust-2): Update to 2.41.1. > [build-system]: Replace gnu-build-system with cmake-build-system. > [arguments]<#:phases>: Invoke cmake directly to build the main package > and invoke make directly to build ancillary tools. > [native-inputs]: Replace llvm-3.8 with llvm. Applied, thanks for the quick reply! Ludo=E2=80=99. From unknown Wed Jun 18 23:08:07 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 10 Aug 2022 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator