CVS commit: pkgsrc/parallel/pocl

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 22 10:44:56 UTC 2024

Modified Files:
        pkgsrc/parallel/pocl: Makefile distinfo
Added Files:
        pkgsrc/parallel/pocl/patches: patch-CMakeLists.txt

Log Message:
pocl: updated to 5.0

5.0
http://portablecl.org/docs/html/notes_5_0.html


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/parallel/pocl/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/parallel/pocl/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/parallel/pocl/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/pocl/Makefile
diff -u pkgsrc/parallel/pocl/Makefile:1.14 pkgsrc/parallel/pocl/Makefile:1.15
--- pkgsrc/parallel/pocl/Makefile:1.14  Wed Nov  8 13:20:39 2023
+++ pkgsrc/parallel/pocl/Makefile       Mon Apr 22 10:44:56 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2023/11/08 13:20:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/22 10:44:56 adam Exp $
 
-DISTNAME=      pocl-4.0
-PKGREVISION=   1
+DISTNAME=      pocl-5.0
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pocl/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,18 +10,14 @@ HOMEPAGE=   http://portablecl.org/
 COMMENT=       Portable implementation of the OpenCL standard
 LICENSE=       mit
 
-USE_CMAKE=     yes
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
+USE_CXX_FEATURES=      c++11
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            pkg-config
+TEST_TARGET=           check
 
-TEST_TARGET=   check
-
-USE_CXX_FEATURES+=     c++11
-
-CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+=   -DCMAKE_INSTALL_LIBDIR="lib"
+CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
+#CMAKE_ARGS+=  -DCMAKE_INSTALL_LIBDIR=lib
 CMAKE_ARGS+=   -DPOCL_INSTALL_ICD_VENDORDIR="${PREFIX}/share/examples/OpenCL/vendors"
-CMAKE_ARGS+=   -DKERNELLIB_HOST_CPU_VARIANTS="distro"
 CMAKE_ARGS+=   -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
 
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/pocl
@@ -33,9 +28,11 @@ GENERATE_PLIST+=     find ${DESTDIR}${PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
-# "LLVM could not recognize your CPU model automatically..."
-.if !empty(MACHINE_ARCH:Maarch64*)
+# "Don't know what CPU variants to use for kernel library on this platform."
+.if ${MACHINE_ARCH:Maarch64*}
 CMAKE_ARGS+=   -DLLC_HOST_CPU="cortex-a53"
+.else
+CMAKE_ARGS+=   -DKERNELLIB_HOST_CPU_VARIANTS="distro"
 .endif
 
 pre-configure:
@@ -54,6 +51,7 @@ CONF_FILES+=  ${PREFIX}/share/examples/Op
 
 PKGCONFIG_OVERRIDE+=   pocl.pc.in.cmake
 
+.include "../../devel/cmake/build.mk"
 .include "../../lang/clang/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../parallel/hwloc/buildlink3.mk"

Index: pkgsrc/parallel/pocl/distinfo
diff -u pkgsrc/parallel/pocl/distinfo:1.7 pkgsrc/parallel/pocl/distinfo:1.8
--- pkgsrc/parallel/pocl/distinfo:1.7   Mon Sep 11 14:29:33 2023
+++ pkgsrc/parallel/pocl/distinfo       Mon Apr 22 10:44:56 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/09/11 14:29:33 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/04/22 10:44:56 adam Exp $
 
-BLAKE2s (pocl-4.0.tar.gz) = 22d5266690023cf30a24f66b8c4bed621d6c2043dd0911bd9ebfc6b9093bfd3a
-SHA512 (pocl-4.0.tar.gz) = 3835a9e8fc8562d50a91a11b807cf87a096891f5c27675127b66412eacff2e541b6143b49b4155f43a09f4e53faa062ec20f3b20badeca206ece9f45ad50f26a
-Size (pocl-4.0.tar.gz) = 2140919 bytes
+BLAKE2s (pocl-5.0.tar.gz) = c6938b163c59a29722308e33b93060ce42e8739858b57624171ebf53928f4701
+SHA512 (pocl-5.0.tar.gz) = c2d6c80cbcba7af1c31dfa794c2aa7be6d1ce2cc9900fbf6e0a1536747440602cdc0f1a84f81f85737818a7ea60b490558ef328b3b156e52c63db3fe4ce490b0
+Size (pocl-5.0.tar.gz) = 2361502 bytes
+SHA1 (patch-CMakeLists.txt) = df51c150925dbac06f95f94c260230d9dd97f049

Added files:

Index: pkgsrc/parallel/pocl/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/parallel/pocl/patches/patch-CMakeLists.txt:1.4
--- /dev/null   Mon Apr 22 10:44:56 2024
+++ pkgsrc/parallel/pocl/patches/patch-CMakeLists.txt   Mon Apr 22 10:44:56 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.4 2024/04/22 10:44:56 adam Exp $
+
+Fix build.
+
+--- CMakeLists.txt.orig        2024-04-22 10:34:42.233537929 +0000
++++ CMakeLists.txt
+@@ -1199,7 +1199,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/pocl_bui
+ set(DEFAULT_HOST_CLANG_FLAGS "${CLANG_TARGET_OPTION}${LLC_TRIPLE}")
+ set(DEFAULT_HOST_LLC_FLAGS "-relocation-model=pic -mtriple=${LLC_TRIPLE}")
+ 
+-if(ARM32 OR (LLC_TRIPLE MATCHES "^arm"))
++if(ARM32 OR (LLC_TRIPLE MATCHES "^arm") AND NOT APPLE)
+   if(LLC_TRIPLE MATCHES "gnueabihf")
+     # hardfloat
+     set(DEFAULT_HOST_LLC_FLAGS "${DEFAULT_HOST_LLC_FLAGS} -float-abi=hard")