From patchwork Fri Mar 10 00:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47833 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 88F9816D05; Fri, 10 Mar 2023 00:48:34 +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=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED, URIBL_SBL_A 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 1B75516C6A for ; Fri, 10 Mar 2023 00:48:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paQvl-0004yc-5P; Thu, 09 Mar 2023 19:48:21 -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 1paQvg-0004yN-UM for guix-patches@gnu.org; Thu, 09 Mar 2023 19:48:17 -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 1paQvS-0007pO-H7 for guix-patches@gnu.org; Thu, 09 Mar 2023 19:48:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paQvS-0002sB-4z for guix-patches@gnu.org; Thu, 09 Mar 2023 19:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62070] [PATCH] gnu: pocl: Update to 3.1 References: <20230309090624.765-1-atai@atai.org> In-Reply-To: <20230309090624.765-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Mar 2023 00:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62070@debbugs.gnu.org Cc: Andy Tai Received: via spool by 62070-submit@debbugs.gnu.org id=B62070.167840924910912 (code B ref 62070); Fri, 10 Mar 2023 00:48:02 +0000 Received: (at 62070) by debbugs.gnu.org; 10 Mar 2023 00:47:29 +0000 Received: from localhost ([127.0.0.1]:53341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paQuu-0002pw-I2 for submit@debbugs.gnu.org; Thu, 09 Mar 2023 19:47:28 -0500 Received: from mail-pl1-f177.google.com ([209.85.214.177]:36354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paQus-0002pi-U1 for 62070@debbugs.gnu.org; Thu, 09 Mar 2023 19:47:27 -0500 Received: by mail-pl1-f177.google.com with SMTP id ky4so3954836plb.3 for <62070@debbugs.gnu.org>; Thu, 09 Mar 2023 16:47:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678409240; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=SbM0tfrQ/sn7ySr/6mf+ESKwunyOP+U7Gh3mf0gqjL8=; b=K0XBU3hfK3X1W872keTz2eXBcgJYiT5PSIgjp2wkVF6hp9Nq+1KXS2YpaJcgFdv7WU PlaQSJI/wL5DrqNGd0fzBxuU8oGMc7VZ4eUoCiyktseGCc+pxNLDdiRyeTvnRSOvIQ4b 0hUONhb8di9GbQeKOx0grLrmpqjOAObpmxhgoajhRAVYLY9quNHLRi8HEaXpZwk+hLtL rP7vDw3bDRtlc3wsKba3DW7y/ROxB3Ns7+jE8qoroBgOGuCdliuQ14pq2p+9AowbnvkH SxZZ4sgFiMLZgA5vMm5KmtdtTWqUVcjxBCbVhFMQsm2m9jJ3TdXJUS1bAxn3jjG7eqyb Xenw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678409240; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SbM0tfrQ/sn7ySr/6mf+ESKwunyOP+U7Gh3mf0gqjL8=; b=TXF+Hap0tdQp0v72sFxXjev7tkWhDNtsnF7RywfKPaQtC8I1f1kMQBokGZHZfKvMsK t9w0N05JDleh7gdetRMNusgmELR8DSZSovkqZ1ZlD7IKRErJzOP3ifQ5CrnNI7bVgiK0 0umDFyCIzv14Rod7YvokW3/F5iX2bu1JOkbXbxxNQ++jp/y3iARqUDR6SBbfC4jY0S1/ 359XRPXsNMH6oWuc+8raP3MrOBz9EbP52o4G+tnVC0nDi1lsJHoYuYO7h8i+sBgphZLT Om4+MEzcINPIuvqs51Xt90hjqTzAD1gUGIh6U8hS+VyHEv1E3vfIn2/NVhtA3lxnp4G2 lleg== X-Gm-Message-State: AO0yUKWU3hIqjDa490P8rikvF5v9FjQiLP2TDjkcUKNzKM1djt468sOc Txe80ACSubmuIVx05SEgHlSP2hLpe4A= X-Google-Smtp-Source: AK7set/rx3DGCVAjB5BekRS7gnCkD9foDvtbNIfFihfTkPXydLYD3vCpWKhV/U0gc85tnlgA/KNzJQ== X-Received: by 2002:a17:902:d886:b0:19e:cfbd:cc73 with SMTP id b6-20020a170902d88600b0019ecfbdcc73mr12518309plz.26.1678409240300; Thu, 09 Mar 2023 16:47:20 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id k20-20020a170902761400b0019cbec6c17bsm207781pll.190.2023.03.09.16.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 16:47:19 -0800 (PST) From: Andy Tai Date: Thu, 9 Mar 2023 16:47:15 -0800 Message-Id: <20230310004715.11762-1-atai@atai.org> X-Mailer: git-send-email 2.39.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/opencl.scm (pocl): Update to 3.1 [native-inputs]: Add python-3 [arguments]: Update RPATH --- gnu/packages/opencl.scm | 62 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 29 deletions(-) base-commit: f289fe316aaa06e60f4b10e75e113cf1aeb03629 diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 2e506156b2..b25438ba98 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -279,38 +279,42 @@ (define-public beignet (define-public pocl (package (name "pocl") - (version "1.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pocl/pocl") - (commit (string-append "v" version)))) - (sha256 - (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a")) - (file-name (git-file-name name version)))) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pocl/pocl") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1pw4q0hi5ynx34fvzryravz3jbh89f9cg60fkjj77sxh9xw8phdd")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) - (native-inputs - (list libltdl pkg-config)) - (inputs - (list clang-9 llvm-9 `(,hwloc-2 "lib") opencl-icd-loader)) + (native-inputs (list libltdl pkg-config python-3)) + (inputs (list clang-15 llvm-15 + `(,hwloc-2 "lib") opencl-icd-loader)) (arguments - `(#:configure-flags - (list "-DENABLE_ICD=ON" - "-DENABLE_TESTSUITES=ON" - ;; We are not developers, don't run conformance suite. - "-DENABLE_CONFORMANCE=OFF" - (string-append "-DEXTRA_HOST_LD_FLAGS=-L" - (assoc-ref %build-inputs "libc") "/lib")) - #:phases - (modify-phases %standard-phases - (add-before 'check 'set-HOME - (lambda _ - (setenv "HOME" "/tmp") + `(#:configure-flags (let* ((libdir (string-append (assoc-ref %outputs + "out") + "/lib"))) + (list "-DENABLE_ICD=ON" + "-DENABLE_TESTSUITES=ON" + ;; We are not developers, don't run conformance suite. + "-DENABLE_CONFORMANCE=OFF" + (string-append "-DEXTRA_HOST_LD_FLAGS=-L" + (assoc-ref %build-inputs + "libc") "/lib") + ;; We need both libdir and libdir/pocl in RUNPATH. + (string-append "-DCMAKE_INSTALL_RPATH=" + libdir ";" libdir "/pocl"))) + #:phases (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ + (setenv "HOME" "/tmp") - ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a - ;; fake topology. - (setenv "HWLOC_SYNTHETIC" "4")))))) + ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a + ;; fake topology. + (setenv "HWLOC_SYNTHETIC" "4")))))) (home-page "http://portablecl.org/") (synopsis "Portable Computing Language (pocl), an OpenCL implementation") (description