From patchwork Thu Mar 9 09:06:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47810 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 0006D16E3B; Thu, 9 Mar 2023 09:07:24 +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 7D08816E31 for ; Thu, 9 Mar 2023 09:07:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paCEq-0001Em-4B; Thu, 09 Mar 2023 04:07:04 -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 1paCEo-0001Dd-Li for guix-patches@gnu.org; Thu, 09 Mar 2023 04:07:02 -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 1paCEo-0006U9-C5 for guix-patches@gnu.org; Thu, 09 Mar 2023 04:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paCEn-0006Cf-OC for guix-patches@gnu.org; Thu, 09 Mar 2023 04:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62070] [PATCH] gnu: pocl: Update to 3.1 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Mar 2023 09:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62070@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167835279723805 (code B ref -1); Thu, 09 Mar 2023 09:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2023 09:06:37 +0000 Received: from localhost ([127.0.0.1]:50872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paCEP-0006Bs-6y for submit@debbugs.gnu.org; Thu, 09 Mar 2023 04:06:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:48230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paCEN-0006Bg-A0 for submit@debbugs.gnu.org; Thu, 09 Mar 2023 04:06:35 -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 1paCEN-0000mL-3Z for guix-patches@gnu.org; Thu, 09 Mar 2023 04:06:35 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paCEK-0006NE-2k for guix-patches@gnu.org; Thu, 09 Mar 2023 04:06:34 -0500 Received: by mail-pl1-x633.google.com with SMTP id a9so1266061plh.11 for ; Thu, 09 Mar 2023 01:06:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678352790; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=Cd/eeX+Hhyj+dPiBjrSBR/0MP9bpm5d6RiyxSWPBx18=; b=NGzbXreqfO8gRLJf6xiQ7Hah4v8a9aGbpgqrG4a/liAze/bT1ZrN9qHyxAVQydHF4R bXtRKP4Siq8n1Dp0UOwOgnJ/Q+epU7F7mDJvFfVFfw5Jg6do3cU1onQE2NUkdve5uJXC 6jG53lwxMbNHBEYRe55hzmGYbwmOufZ+PwFaxRBDcpzEqQKd/zUT+0TXQBrewiWCPjgY IGyaWo60W8MA6OgtlvoDChRdnlvCOptap8ojddyeKO4JUekFK8WKWnLBiSzTvIvyMacK 7wZeSBgLCqiNBbotMvFyCzOHKqosIKIUbgt+2fT2+cu2F3JDWKgEVEXgBzqgxZ4PNFk9 5cTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678352790; 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=Cd/eeX+Hhyj+dPiBjrSBR/0MP9bpm5d6RiyxSWPBx18=; b=eJdNo5Dte/1eYAcEcx/fHffHzmVM78uM8k34CohHFxiP3d0XVuOiUOr8SjDYttJSjO JS09OOGjRpLK1DLK5L3GIxJRqqP0mZtDFaanhIOTtaFYF1JSbaIhl4SxduV0Z42uiPWK DmSfbtuzlnh5dhC5Qo0XBbIPDXhAv9m9aHUonRZ8y+gLYqzW6mNXjf4Qr7AzCQJ+wTQH VMRBsqi+nUbb3u9ZdEJmx/1LApT1jU7+i8ItRhnnNhfWiJ6pGgWq3Yz0qypqrEb6U2Ko 4JeZ0tgRhGpP8bgyfj3YKOl1WlHnbx/I+B3F9qhNH7Urx2EnI5/P/UZNGdv4MVXxdkUS UdVg== X-Gm-Message-State: AO0yUKWAqJk07/okdgvbyeZvYR1YNDFZSiYzA6zT8Jj6twaI1NDwC1Nm cHuKjlvWeUxukDwrtvRn26r8KDkJk/E= X-Google-Smtp-Source: AK7set+QzGKHZmsbIabUd4ZIJF5R++B5G9H8E8l/kATiTxC2m7vWoSpJhzqmeqQv28fiBzi4xe6Jxg== X-Received: by 2002:a17:90b:3847:b0:230:cd41:bbdf with SMTP id nl7-20020a17090b384700b00230cd41bbdfmr21998025pjb.26.1678352789859; Thu, 09 Mar 2023 01:06:29 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id d19-20020a63d713000000b00502dc899394sm10174798pgg.66.2023.03.09.01.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 01:06:29 -0800 (PST) From: Andy Tai Date: Thu, 9 Mar 2023 01:06:24 -0800 Message-Id: <20230309090624.765-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x633.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=no autolearn_force=no X-Spam_action: no action 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..01c1d40d6c 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-9 llvm-9 + `(,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