From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oPOkCPsxOmHDrwAAgWs5BA (envelope-from ) for ; Thu, 09 Sep 2021 18:10:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qHcOBPsxOmE+CQAA1q6Kng (envelope-from ) for ; Thu, 09 Sep 2021 16:10:35 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5EDA116FD8 for ; Thu, 9 Sep 2021 18:10:34 +0200 (CEST) Received: from localhost ([::1]:46710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOMdF-0000Bx-5M for larch@yhetil.org; Thu, 09 Sep 2021 12:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOLdm-0003cM-LL for guix-patches@gnu.org; Thu, 09 Sep 2021 11:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOLdm-0006LR-DS for guix-patches@gnu.org; Thu, 09 Sep 2021 11:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mOLdm-0000nz-2E for guix-patches@gnu.org; Thu, 09 Sep 2021 11:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50486] [PATCH] gnu: llvm: Update to 12.0.1 Resent-From: =?UTF-8?Q?V=C3=96R=C3=96SK=C5=90I_?= =?UTF-8?Q?Andr=C3=A1s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Sep 2021 15:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50486 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50486@debbugs.gnu.org Cc: =?UTF-8?Q?V=C3=96R=C3=96SK=C5=90I_?= =?UTF-8?Q?Andr=C3=A1s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16311999873031 (code B ref -1); Thu, 09 Sep 2021 15:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Sep 2021 15:06:27 +0000 Received: from localhost ([127.0.0.1]:35988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOLdD-0000mp-BG for submit@debbugs.gnu.org; Thu, 09 Sep 2021 11:06:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:53492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOLd8-0000me-Pu for submit@debbugs.gnu.org; Thu, 09 Sep 2021 11:06:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOLd8-0003a2-KV for guix-patches@gnu.org; Thu, 09 Sep 2021 11:06:22 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:38778) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOLd6-0005fQ-RP for guix-patches@gnu.org; Thu, 09 Sep 2021 11:06:22 -0400 Received: by mail-wr1-x42a.google.com with SMTP id u16so3037783wrn.5 for ; Thu, 09 Sep 2021 08:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ACWgruAdlmSvjvyE3NlWnB7fzeTdMGNGWzXmaJduNvk=; b=ZKQ40W/LO6KHFAAW3ylsqU5HNsmGYHhi6UgToWE6qIZWjwwOCXg9rZd6PgeXAIWpXA UnwEQ1SfcAJh9JDEIHtPO8gKmYImUtwKA9uhGwKFZdhBPfFMCN8Lbero1Sdi9o3gFTk6 P1Qf2ic2PzJyZT7vN6przTzA6kk1VckW5AACKpUEenf6WeCapF1uz2WQVpEighbPsVlH 5HntuscthOxmw3uq7PuPVvAF74HxLJSgIZOyJlub65g1fFMkCYSZJj02RoSCl05Mh7vZ 6xzYKA2hF2f+oMcXcYhCvVo5C7RCEzb742SZMw/1JPPXwt5UdI+hPqN+hpJ2oDiyS56u 5AAQ== 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=ACWgruAdlmSvjvyE3NlWnB7fzeTdMGNGWzXmaJduNvk=; b=2XycvPTgL4nf/ar4pfG9SqCaRI1zFSg4S2PAgtU5kxlzSJjExB8/lXQg7KzZ49+iZq c7EPbfjzSgpgt2W/rdun1wWh1nVfjbi3e78EDnCE87Mv27IlS1CnQlVIzxfxZyJPSHn+ 4kKNJb3JiMYBAGmKju6ZzwXN9jo0NjFQPUvqEVTAKGpkIYGOx8UkfPtCvnODVNvYMPaI VOR6ZkgqJ14QmeImSkv92VvuAAO1YP2yahZqnY2D1Cyc8/KiCdsqLYj2oLT+pwhhtgIQ FU2xGw5dpVOV+bGJoa1uSoWYhCQKW5sTk2uroEx76qJybRiymRflFdGV9qEXmmpTKPS+ /Cqg== X-Gm-Message-State: AOAM532ZyQg3kfO14TloRjVbZUp5QUW/gT/EKaNJYLUm9wvoyUjfHc6l ohUszsRE56Mb0oW6Q/ZVfHLXi0v/HUU= X-Google-Smtp-Source: ABdhPJykFg6gTphD0QHpErp4TW677OBpfvIBB6p0u7uAQbkmvrm+L9L9izgPjOOSw214YjYduphadA== X-Received: by 2002:adf:db83:: with SMTP id u3mr4284896wri.363.1631199977950; Thu, 09 Sep 2021 08:06:17 -0700 (PDT) Received: from puruttya.lan (87-97-125-36.pool.digikabel.hu. [87.97.125.36]) by smtp.gmail.com with ESMTPSA id p16sm1860224wmi.11.2021.09.09.08.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 08:06:17 -0700 (PDT) From: =?UTF-8?Q?V=C3=96R=C3=96SK=C5=90I_?= =?UTF-8?Q?Andr=C3=A1s?= Date: Thu, 9 Sep 2021 17:06:09 +0200 Message-Id: <20210909150609.30645-1-voroskoi@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=voroskoi@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 09 Sep 2021 12:10:02 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631203834; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ACWgruAdlmSvjvyE3NlWnB7fzeTdMGNGWzXmaJduNvk=; b=a8UEckOF1rorwgDkakvSmUxYh5dxZsBgbOnVD3UXEZ4RYPN4+w56Jsx+8e3kTUh+EfR5Q6 Eoq7OHyc4+7oFr+vcgDY2FQjabM1ZHdBvDf3kx4Ko/fotWi5ye6MNUsADde8YLdbvERCk9 8yKZv/h5EhpdB/oLk8KsMlq1SGQ5w3WcA443064kxls4dBmfMZD0Y8MTBi92rXJ2aYBZIb 4JtIqxPajXDkMFkDKo2Qahurr642DrC9txzORY1bmbUiQZrhHwBG2XFa9a5oQ6c5S+nXF5 ED4qk3Xnn80QM0O9bn6h8xPSsqF9fQ95wykOhaqgz3RKrpbTIVVIpqIaaOZnxQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631203834; a=rsa-sha256; cv=none; b=XL3cCANq3C+czP6XVZnnXFkjKb/2cdDcNTjzoPNDkJQ0lnhDvM/PhEvQBO9RJHJqQMaGfa 7h2rilYqq/DTue1nSJbf3Zlwx/1yekraEfQ0n6j0VGwjMLvRTjonwasnq705djEvebFbbu qBz/XdvISlq+BldjbCWIUB/3j2m6tjkIQh32bcCWlBHO7KeTPUuQne4AIiS1y1tMEGjEKY EYbPiDTN4NIeqpvkuluuwKXXgzUWv7vv3sMpfUdxoy0FPyAVLo2tLkaZl2FJMB78XC2jN1 MqoTjW5dSTyAaiHpSxxFH1xVWFc5Ezy4n+fvar+wq/KH7hNiHNkPG4HPOacnLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="ZKQ40W/L"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="ZKQ40W/L"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5EDA116FD8 X-Spam-Score: 3.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: BOyVUf+HFkb0 * gnu/packages/llvm.scm (llvm): Update to 12.0.1 (clang-runtime-12, clang-12, clang-tools-extra-12) update hashes * gnu/packages/patches/clang-12-tools-extra-directory.patch: added in upsteam, removed --- gnu/local.mk | 1 - gnu/packages/llvm.scm | 12 +++++------- .../patches/clang-12-tools-extra-directory.patch | 16 ---------------- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/clang-12-tools-extra-directory.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2a56c4a9e2..7dcbd1f4f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -920,7 +920,6 @@ dist_patch_DATA = \ %D%/packages/patches/clang-9.0-libc-search-path.patch \ %D%/packages/patches/clang-10.0-libc-search-path.patch \ %D%/packages/patches/clang-11.0-libc-search-path.patch \ - %D%/packages/patches/clang-12-tools-extra-directory.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4394194939..2ce8757574 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -479,14 +479,14 @@ output), and Binutils.") (define-public llvm-12 (package (name "llvm") - (version "12.0.0") + (version "12.0.1") (source (origin (method url-fetch) (uri (llvm-uri "llvm" version)) (sha256 (base32 - "0l4b79gwfvxild974aigcq1yigypjsk2j5p59syhl6ksd744gp29")))) + "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx")))) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) (native-inputs @@ -541,22 +541,20 @@ of programming tools as well as libraries with equivalent functionality.") (define-public clang-runtime-12 (clang-runtime-from-llvm llvm-12 - "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45")) + "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l")) (define-public clang-12 (clang-from-llvm llvm-12 clang-runtime-12 - "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2" + "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf" #:patches '("clang-11.0-libc-search-path.patch") #:tools-extra (origin (method url-fetch) (uri (llvm-uri "clang-tools-extra" (package-version llvm-12))) - (patches - (search-patches "clang-12-tools-extra-directory.patch")) (sha256 (base32 - "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd"))))) + "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"))))) (define-public clang-toolchain-12 (make-clang-toolchain clang-12)) diff --git a/gnu/packages/patches/clang-12-tools-extra-directory.patch b/gnu/packages/patches/clang-12-tools-extra-directory.patch deleted file mode 100644 index 0a236da26e..0000000000 --- a/gnu/packages/patches/clang-12-tools-extra-directory.patch +++ /dev/null @@ -1,16 +0,0 @@ -Help CMake locate the "tools-extra" directory. - -Taken from . - -diff --git a/clang-tools-extra/clangd/quality/CompletionModel.cmake b/clang-tools-extra/clangd/quality/CompletionModel.cmake ---- a/clangd/quality/CompletionModel.cmake -+++ b/clangd/quality/CompletionModel.cmake -@@ -5,7 +5,7 @@ - # will define a C++ class called ${cpp_class} - which may be a - # namespace-qualified class name. - function(gen_decision_forest model filename cpp_class) -- set(model_compiler ${CMAKE_SOURCE_DIR}/../clang-tools-extra/clangd/quality/CompletionModelCodegen.py) -+ set(model_compiler ${CMAKE_CURRENT_LIST_DIR}/quality/CompletionModelCodegen.py) - - set(output_dir ${CMAKE_CURRENT_BINARY_DIR}) - set(header_file ${output_dir}/${filename}.h) -- 2.33.0