From patchwork Wed Nov 16 14:18:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 44544 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 312FE27BBEC; Wed, 16 Nov 2022 14:20:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 CD79327BBE9 for ; Wed, 16 Nov 2022 14:20:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovJFs-0000Ey-RI; Wed, 16 Nov 2022 09:19:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovJFp-0000Ac-99 for guix-patches@gnu.org; Wed, 16 Nov 2022 09:19:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovJFn-0000ZJ-VA for guix-patches@gnu.org; Wed, 16 Nov 2022 09:19:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovJFn-0001Ut-QE for guix-patches@gnu.org; Wed, 16 Nov 2022 09:19:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 4/5] gnu: Add libomp-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59237@debbugs.gnu.org Cc: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083355701 (code B ref 59237); Wed, 16 Nov 2022 14:19:03 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:18:55 +0000 Received: from localhost ([127.0.0.1]:56452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFe-0001To-OB for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:55 -0500 Received: from mail-qk1-f173.google.com ([209.85.222.173]:43963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFa-0001T0-KS for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:51 -0500 Received: by mail-qk1-f173.google.com with SMTP id i9so11651912qki.10 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=knewoYUPye4EtPrsR2bfKapncUD9H0L6/PE2F3FfYLY=; b=VtPtzjydrwV+TDDpi/KuWwJGq+C+O1YMqYt1IldiN3wJxVO0Ic9CKjb4igZyqGgG5c GeDx4/lk8ollmkkhsw4xcsqqsU0Gc4x+WCkCrbuoW0/kcCuiR46EAsnm7pRMPYtfYdJT neK4IwXyQRHCfzTpvMx8t08zYIDbhL8rSYxUBUWaRS/Vecx+cLIv2Wz3kEm23q/cvTCp pUx8J46yc3PTBMJKfzjvds4pexwIOiFpmPpShTtEdmPRNGDNHyodvC5HbMS2qHPFjqJF 4g33y1bfHEgWr/jxZgPH7xLloMdOCcsYB5aJBV11yAT8E50tVCTAKJgMrVnr6bTBx2hb 7dNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=knewoYUPye4EtPrsR2bfKapncUD9H0L6/PE2F3FfYLY=; b=s+2mKwe3v4JYaGTtKfSVmJe8tIy+FOOdPidCfsmTNFNwCDxG39WWpN+ptHQIR+RQL2 frv42O74HjhhkcKlTB4k8wPbeRGYNMxOnujdnrH495dwSpKDLrBNRf7bhnawBJwhsDrq ZzJCa1G+yF8hjOLbQXzCM4VshdZzSwklcvf/zUzhA4Ey/LQtzOlzRYX7JWkul7sTrRmR S5vlQJ/eDBMJiSiyKaHj3qWA/V0n+FuaZlYKJmrrhTT49RUMYq/krRtd2kb1O6uXkkxp uSYkYNwh6KeOAefbTNG81oov8voazBSrmzVWAQt70+p7BpjVEwBuig2/FYhFUt84rDUq K4zw== X-Gm-Message-State: ANoB5pldZJz1OzjcB62IuUTlrWwflMbifsm6SmqS8jHRGlsgMrNY7ymP tZBeSGH4pccJUqQTUjsIcipW6gykYlkBVg== X-Google-Smtp-Source: AA0mqf6kUtBG+Yd56zwtJwVkQSBBlRgXLoDGpIUmg1bQfH6r6YuxGU3jMq9eINhI2hUfhw9q94SwYw== X-Received: by 2002:a37:a902:0:b0:6fa:2bd2:897f with SMTP id s2-20020a37a902000000b006fa2bd2897fmr19293451qke.87.1668608324969; Wed, 16 Nov 2022 06:18:44 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:44 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:29 -0500 Message-Id: <20221116141830.12398-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> References: <20221116141830.12398-1-maxim.cournoyer@gmail.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (libomp-15): New variable. (libomp-14): Inherit from it. [arguments]: Use substitute-keyword-arguments and override the chdir-to-source-and-install-license phase. Remove redundant fields. --- gnu/packages/llvm.scm | 75 ++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 2b958b060e..528c2bc359 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -755,10 +755,44 @@ (define-public clang-14 (base32 "0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw"))))) +(define-public libomp-15 + (package + (name "libomp") + (version (package-version llvm-15)) + (source (llvm-monorepo version)) + (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 "openmp") + (install-file "LICENSE.TXT" + (string-append #$output "/share/doc"))))))) + (native-inputs (list clang-15 llvm-15 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-14 (package - (name "libomp") + (inherit libomp-15) (version (package-version llvm-14)) (source (origin (method url-fetch) @@ -767,36 +801,19 @@ (define-public libomp-14 (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"))))))) + (substitute-keyword-arguments (package-arguments libomp-15) + ((#:phases phases) + #~(modify-phases #$phases + (replace '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))) + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-14) + (replace "llvm" llvm-14))))) (define-public clang-toolchain-14 (make-clang-toolchain clang-14 libomp-14))