Skip to content

Commit 6a23ef8

Browse files
andy-taicivodul
authored andcommitted
gnu: pocl: Update to 3.1
* gnu/packages/opencl.scm (pocl): Update to 3.1 [native-inputs]: Add python-3 [arguments]: Update RPATH. Skip failed tests on aarch64 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
1 parent 210c929 commit 6a23ef8

File tree

1 file changed

+44
-29
lines changed

1 file changed

+44
-29
lines changed

gnu/packages/opencl.scm

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -279,38 +279,53 @@ back-end for the LLVM compiler framework.")
279279
(define-public pocl
280280
(package
281281
(name "pocl")
282-
(version "1.4")
283-
(source
284-
(origin
285-
(method git-fetch)
286-
(uri (git-reference
287-
(url "https://github.com/pocl/pocl")
288-
(commit (string-append "v" version))))
289-
(sha256
290-
(base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a"))
291-
(file-name (git-file-name name version))))
282+
(version "3.1")
283+
(source (origin
284+
(method git-fetch)
285+
(uri (git-reference
286+
(url "https://github.com/pocl/pocl")
287+
(commit (string-append "v" version))))
288+
(sha256
289+
(base32
290+
"1pw4q0hi5ynx34fvzryravz3jbh89f9cg60fkjj77sxh9xw8phdd"))
291+
(file-name (git-file-name name version))
292+
(modules '((guix build utils)))
293+
(snippet
294+
'(begin
295+
;; "kernel/test_printf_vectors" and
296+
;; "kernel/test_printf_vectors_ulongn"
297+
;; fail on aarch5 and likely other platforms
298+
;; as commented in CMakeLists.txt
299+
;; thus disable the block in CMakeList.txt adding
300+
;; these two tests
301+
(substitute* "tests/kernel/CMakeLists.txt"
302+
(("NOT ENABLE_POCL_FLOAT_CONVERSION") "false"))))))
292303
(build-system cmake-build-system)
293-
(native-inputs
294-
(list libltdl pkg-config))
295-
(inputs
296-
(list clang-9 llvm-9 `(,hwloc-2 "lib") opencl-icd-loader))
304+
(native-inputs (list libltdl pkg-config python-3))
305+
(inputs (list clang-15 llvm-15
306+
`(,hwloc-2 "lib") opencl-icd-loader))
297307
(arguments
298-
`(#:configure-flags
299-
(list "-DENABLE_ICD=ON"
300-
"-DENABLE_TESTSUITES=ON"
301-
;; We are not developers, don't run conformance suite.
302-
"-DENABLE_CONFORMANCE=OFF"
303-
(string-append "-DEXTRA_HOST_LD_FLAGS=-L"
304-
(assoc-ref %build-inputs "libc") "/lib"))
305-
#:phases
306-
(modify-phases %standard-phases
307-
(add-before 'check 'set-HOME
308-
(lambda _
309-
(setenv "HOME" "/tmp")
308+
`(#:configure-flags (let* ((libdir (string-append (assoc-ref %outputs
309+
"out")
310+
"/lib")))
311+
(list "-DENABLE_ICD=ON"
312+
"-DENABLE_TESTSUITES=ON"
313+
;; We are not developers, don't run conformance suite.
314+
"-DENABLE_CONFORMANCE=OFF"
315+
(string-append "-DEXTRA_HOST_LD_FLAGS=-L"
316+
(assoc-ref %build-inputs
317+
"libc") "/lib")
318+
;; We need both libdir and libdir/pocl in RUNPATH.
319+
(string-append "-DCMAKE_INSTALL_RPATH="
320+
libdir ";" libdir "/pocl")))
321+
#:phases (modify-phases %standard-phases
322+
(add-before 'check 'set-HOME
323+
(lambda _
324+
(setenv "HOME" "/tmp")
310325

311-
;; Since 2.9.0, hwloc fails when /sys is missing, so provide a
312-
;; fake topology.
313-
(setenv "HWLOC_SYNTHETIC" "4"))))))
326+
;; Since 2.9.0, hwloc fails when /sys is missing, so provide a
327+
;; fake topology.
328+
(setenv "HWLOC_SYNTHETIC" "4"))))))
314329
(home-page "http://portablecl.org/")
315330
(synopsis "Portable Computing Language (pocl), an OpenCL implementation")
316331
(description

0 commit comments

Comments
 (0)