From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qNt4NYqWDWQ7awAASxT56A (envelope-from ) for ; Sun, 12 Mar 2023 10:08:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id aH8aNYqWDWR4swAAauVa8A (envelope-from ) for ; Sun, 12 Mar 2023 10:08:26 +0100 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 549ACC0E2 for ; Sun, 12 Mar 2023 10:08:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbHgf-000336-MO; Sun, 12 Mar 2023 05:08:17 -0400 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 1pbHgQ-000311-Qb for guix-patches@gnu.org; Sun, 12 Mar 2023 05:08:02 -0400 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 1pbHgQ-0002Lj-I5 for guix-patches@gnu.org; Sun, 12 Mar 2023 05:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbHgQ-00047j-4s for guix-patches@gnu.org; Sun, 12 Mar 2023 05:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62070] [PATCH v2] 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: Sun, 12 Mar 2023 09:08: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.167861206115820 (code B ref 62070); Sun, 12 Mar 2023 09:08:02 +0000 Received: (at 62070) by debbugs.gnu.org; 12 Mar 2023 09:07:41 +0000 Received: from localhost ([127.0.0.1]:59157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbHg4-000474-Gj for submit@debbugs.gnu.org; Sun, 12 Mar 2023 05:07:40 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:46705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbHg1-00046p-RV for 62070@debbugs.gnu.org; Sun, 12 Mar 2023 05:07:39 -0400 Received: by mail-pj1-f48.google.com with SMTP id f6-20020a17090ac28600b0023b9bf9eb63so636585pjt.5 for <62070@debbugs.gnu.org>; Sun, 12 Mar 2023 01:07:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678612051; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=x+Yg3sPcnHVwdJKospPLOZiqOjWElSQDuRZhjfRepJk=; b=FgfSZ2Uj8Sn+Fsmx9aCyz6YorfnrPJ6ddoWxaG89E87IFmrY4EMYHetRjwK0T9/WcU PTZuaJRM2N0gDhKnNzWXd7AhIH2mTVGegtjHc47bueNEo9gWR+oEyqV0Eip1mAJ+uemj EMx/7HTyL4kNTSXh+zeNqwQ7w3CKrxgHREIqBJk1bgnRHv6wqceLEMs0Mno/hNVotwx8 sBNaYDge8wbY9+hDFzaZscZ/bFlAmJSdi2CNv98+BoL9+gHDqYw8POFIiFig0sUtXxUJ yMZBcQWGYwzMF6MxLaTScYXFj8QKfMpm9PtfXtSxj3AvegpmmdXXVZBkZJKnbLX8/zoI VtIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678612051; 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=x+Yg3sPcnHVwdJKospPLOZiqOjWElSQDuRZhjfRepJk=; b=ftgVjjGrr+lk1mrwz4YSPfAL+fZAHTzd/u7BAhZOyeha/pkDEZ42n+8B4FYiGdFN53 A0HkDlkb6OP7Q/Ylp1hAST39eKMuI2ylz3RXdeIELTeQDtl4QZWWBmwuXDrIm/tuMlDW e1WYFR16sM9JN4pmbgn/AxzjGpaWiwEpJHvkt9gZmmC3XzEw5F2KhXyoIkwS00xmJI9G lGHFa9iD4gSKayjAZPU2z99Tkvs7XZjgriMSHRvFWx7POkK0NKXKJKYYvQyFUI4gCTdp +DOhl9hGIiNj9j4C3fKOBedTe5Yd7T+t3tTi8wzR7mIoRPo2C31mLglGcPrLIr3ziGf3 ccDw== X-Gm-Message-State: AO0yUKUekznACn+YBnuuNwcKd3wLsEM6kMgGKmisGlVTDYSgsN4crHzH dWW8Dk8oJ3M/Z7rTnNLyCv1mgdLSaQI= X-Google-Smtp-Source: AK7set/SNG6SlbqXkFp0U//BLfkF61OCnkKH6TMwZ5xxj0cRBmSNlZCmxig0ytEBc3RvoKy4vNrGIw== X-Received: by 2002:a17:902:c94b:b0:19d:553:746b with SMTP id i11-20020a170902c94b00b0019d0553746bmr37093040pla.66.1678612051393; Sun, 12 Mar 2023 01:07:31 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id ld8-20020a170902fac800b0019fcece6847sm521697plb.227.2023.03.12.01.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 01:07:31 -0800 (PST) Date: Sun, 12 Mar 2023 01:07:27 -0800 Message-Id: <20230312090727.8588-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , From: Andy Tai via Guix-patches Reply-To: Andy Tai Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=FgfSZ2Uj; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678612106; a=rsa-sha256; cv=none; b=YChrv5SXVCYFBKcaSa3Cc8F+7shJNOFbTAEgvJhKJwOvV0o84NhHm1d5FH21CHijhk+UoC kx8Ifbh66CM7RCXvJmOE0LG9zrgw8NfawxjsVze1IqG5fO/WpbGJDeNWDLKkgqZOff0SjB VAf+QtRb2PMk+40OInxFSU9dHod3V8DnUxmIPbb9IwJToyEbIY71I5N6g3kYtNS4k12f9/ x1HS9f9ryFx5BhUjf89SDzjH/tGqfUK7iqjzWVfzVZM7LsWrMKqyw1djnztB416bLHZWPV buyK4+L5/wxd+L9yNP7NKi38B/dfYA3rAM0V6tOI6MDKezKYiIIqF/0Iq8zOxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678612106; h=from:from:sender:sender:reply-to: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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=x+Yg3sPcnHVwdJKospPLOZiqOjWElSQDuRZhjfRepJk=; b=XJZcpjzNNm71h2IIgbeskVDPoGG4zLxQlnCB6JwtAIllLH5HfN67UVz/oTlWPWBwg5skxR NH7pWpNxNxaB2aSdS1XLbN1abZjoKaxu1blfjLef+uvd5gYK1prR8fss/xB3u4oP1ZRQIc IliQTP8NpVeNQhw4YRxLYQJ+nNkrbCwrQOstMZtLLyiAi6jTavKvSrJCweUqjUu9HA3O8+ Pz2xmrtdsPKHIl3VBB50vOV+59lHTa1SyO7pctcQdeM+G8k/AKw+YhIWNewytUk9bUQTeJ 9ovZ5lIGEo2HN7fexnuGX76UY8pu4WGIkIrGk0pbntcPal05T8u5AKZbSIqhtA== X-Migadu-Spam-Score: -3.21 X-Spam-Score: -3.21 X-Migadu-Queue-Id: 549ACC0E2 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=FgfSZ2Uj; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: 75hKt2EOw3Jh * gnu/packages/opencl.scm (pocl): Update to 3.1 [native-inputs]: Add python-3 [arguments]: Update RPATH. Handle failed tests on aarch64 --- gnu/packages/opencl.scm | 68 +++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 2e506156b2..990f84ff25 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -279,38 +279,48 @@ (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-after 'unpack 'make-failed-tests-on-aarch64-expected-for-cmake + (lambda _ + (substitute* "tests/kernel/CMakeLists.txt" + ;; "kernel/test_printf_vectors" and "kernel/test_printf_vectors_ulongn" + ;; also fail on aarch54, so let them be marked "WILL_DAIL" as well in CMakeLists.txt + (("aarch64-linux-gnu") "")))) + (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 base-commit: 7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5 -- 2.39.1