From patchwork Thu Sep 9 13:32:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 32724 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 CE0F527BBE1; Thu, 9 Sep 2021 14:51:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6444C27BBE3 for ; Thu, 9 Sep 2021 14:51:29 +0100 (BST) Received: from localhost ([::1]:36550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOKSe-0003Un-Ga for patchwork@mira.cbaines.net; Thu, 09 Sep 2021 09:51:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOKSF-0003Ee-5C for guix-patches@gnu.org; Thu, 09 Sep 2021 09:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOKSE-0008R2-TQ for guix-patches@gnu.org; Thu, 09 Sep 2021 09:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mOKSE-0004ZW-S2 for guix-patches@gnu.org; Thu, 09 Sep 2021 09:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47006] [PATCH 1/2] gnu: lld: Update to 12.0.0. Resent-From: Liliana Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Sep 2021 13:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47006 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47006@debbugs.gnu.org Cc: maximedevos@telenet.be, efraim@flashner.co.il Received: via spool by 47006-submit@debbugs.gnu.org id=B47006.163119540917479 (code B ref 47006); Thu, 09 Sep 2021 13:51:02 +0000 Received: (at 47006) by debbugs.gnu.org; 9 Sep 2021 13:50:09 +0000 Received: from localhost ([127.0.0.1]:34490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOKRM-0004Xn-Ha for submit@debbugs.gnu.org; Thu, 09 Sep 2021 09:50:09 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:45757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOKRG-0004We-8i for 47006@debbugs.gnu.org; Thu, 09 Sep 2021 09:50:05 -0400 Received: by mail-wm1-f65.google.com with SMTP id j17-20020a05600c1c1100b002e754875260so1454254wms.4 for <47006@debbugs.gnu.org>; Thu, 09 Sep 2021 06:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:to:cc :content-transfer-encoding:mime-version; bh=FBu1ieizj5eSnFR3fkeHb5whX2ottbKvQbbz5tfb/mY=; b=KdFYvzWfKdsECIB57fT4w0hdhTEnXVcqQIkWkBCIeEmR5lcYd/CPQ9cvqfYo8zp+Py jVfctm10QRjVZ7uMHbZxtgifz6PSQJU1JYG6I0PXoWhBuSxH7NZLSbyz3JJ2NeBUP3PX aUGbBgCSSdhaP/VEAO/7neJWB1VKzLWr9Pk4Dsk1oJjNB9xPf6NhXSGUVGhtI5keywj2 UrEhZtxj0zGCOU35KgIdbrLj97YsjEf8IfnRiQux3uc8r+BxCENHv4MsngP/mbvnR+fv 9TU+xJa0Av9Y109qRtCceVKPpRc4h9d/WNH8ZZOC3ZO0FiBxTUulp98iCNC2Dn3vIm1Y m5zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:to:cc:content-transfer-encoding:mime-version; bh=FBu1ieizj5eSnFR3fkeHb5whX2ottbKvQbbz5tfb/mY=; b=24mF+sHF1uTZA1s/AK6DpeKwa0mlachTTTcIrhnIIVvMfSWsIZFPqRFe5Px8xqj7XZ jty89MCvWrC9dUiE0QM8WAl2k1cuLOgpexk5rUIeS4Pf0tZ1UD7QfBgXSk/S0wiZb/2/ x7KBkucwJJHZians7eTn9CXgMJxFmT0hNtS+PpR+qXwV8gIWhzm/RwlZOGi95APyf/wy VQMzx+9r/qXIyjq5B7/1qI674QHCYYpUSm8b0udL8CT9opkWrS2CgReuPkb+Cc+xmQD1 jxXcE+c/QeCOaHKT+gRSGRjEvxZsZMbu7urWY4owlYTXjiUJo8lhZtvYJj5gRNXhfOpa n/0Q== X-Gm-Message-State: AOAM533FJo7U0P1qBgsd3g8VSd6SspgOTXM6fUuwO6cQJgWqgjHVjTJl MIOMy0WFVA5uG1do/zKFBYi+NgeDdqw= X-Google-Smtp-Source: ABdhPJyIP+raPA9uow/TZ9fqEjnQ9RW/RIHAQi6Y0HsYlx5LQDhOgG9/z8ncf1V2Uw6liM82BTCGJA== X-Received: by 2002:a1c:7f84:: with SMTP id a126mr3074393wmd.33.1631195396168; Thu, 09 Sep 2021 06:49:56 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j18sm1927967wrd.56.2021.09.09.06.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 06:49:55 -0700 (PDT) Message-Id: <0f6c5b692df8d06a0d7adddc9e5abf93894a366f.1631195387.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Prikler Date: Thu, 9 Sep 2021 15:32:20 +0200 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-subprojects-origin, %llvm-project-12.0.0-hash): New variables. (lld-11, lld-12): New variables. (lld): Point to lld-11. --- gnu/packages/llvm.scm | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4394194939..220116cbfb 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -92,6 +92,22 @@ as \"x86_64-linux\"." (string-append "https://github.com/llvm/llvm-project/releases/download" "/llvmorg-" version "/" component "-" version ".src.tar.xz")) +(define* (llvm-subprojects-origin components version base32-hash + #:optional (patches '())) + (origin + (method url-fetch) + (uri (llvm-uri "llvm-project" version)) + (sha256 base32-hash) + (patches (map search-patch patches)) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet + `(for-each + (lambda (file) + (unless (member file '("." ".." ,@components)) + (delete-file-recursively file))) + (scandir "."))))) + (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package @@ -882,7 +898,7 @@ of programming tools as well as libraries with equivalent functionality.") (define-public clang clang-9) (define-public clang-toolchain clang-toolchain-9) -(define-public lld +(define-public lld-11 (package (name "lld") (version "11.0.0") @@ -906,6 +922,32 @@ of programming tools as well as libraries with equivalent functionality.") components which highly leverage existing libraries in the larger LLVM Project.") (license license:asl2.0))) ; With LLVM exception +(define %llvm-project-12.0.0-hash + (base32 "0a1n88dmbwp1ww7h3ykf0s001cndk1bm3i2cj1y2sh548f4nilcy")) + +(define-public lld-12 + (package + (inherit lld-11) + (version "12.0.0") + (source (llvm-subprojects-origin '("lld" "libunwind") version + %llvm-project-12.0.0-hash)) + (arguments + `(,@(package-arguments lld-11) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'dissect + (lambda _ + ;; Find libunwind in unpacked sources + (substitute* "lld/MachO/CMakeLists.txt" + (("\\$\\{LLVM_MAIN_SRC_DIR\\}/\\.\\./libunwind") + (string-append (getcwd) "/libunwind"))) + ;; chdir to actual source folder + (chdir "lld")))))) + (inputs + `(("llvm" ,llvm-12))))) + +(define-public lld lld-11) + (define-public lldb (package (name "lldb")