CVS commit: pkgsrc/parallel/ocl-icd

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul  9 18:30:29 UTC 2021

Modified Files:
        pkgsrc/parallel/ocl-icd: Makefile distinfo
Added Files:
        pkgsrc/parallel/ocl-icd/patches: patch-OpenCL.pc.in patch-ocl-icd.pc.in

Log Message:
ocl-icd: Link with -pthread to fix pocl on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/parallel/ocl-icd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/parallel/ocl-icd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in \
    pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in

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

Modified files:

Index: pkgsrc/parallel/ocl-icd/Makefile
diff -u pkgsrc/parallel/ocl-icd/Makefile:1.4 pkgsrc/parallel/ocl-icd/Makefile:1.5
--- pkgsrc/parallel/ocl-icd/Makefile:1.4        Sun Jun 13 12:04:56 2021
+++ pkgsrc/parallel/ocl-icd/Makefile    Fri Jul  9 18:30:29 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2021/06/13 12:04:56 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/07/09 18:30:29 nia Exp $
 
 DISTNAME=      ocl-icd-2.3.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OCL-dev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -31,6 +31,9 @@ CONFIGURE_ARGS+=      --enable-custom-vendord
 PKGCONFIG_OVERRIDE+=   OpenCL.pc.in
 PKGCONFIG_OVERRIDE+=   ocl-icd.pc.in
 
+MAKE_FLAGS.SunOS+=     USE_MAP_TRUE='#'
+MAKE_FLAGS.SunOS+=     USE_MAP_FALSE=
+
 pre-configure:
        cd ${WRKSRC} && autoreconf -fi
 

Index: pkgsrc/parallel/ocl-icd/distinfo
diff -u pkgsrc/parallel/ocl-icd/distinfo:1.1 pkgsrc/parallel/ocl-icd/distinfo:1.2
--- pkgsrc/parallel/ocl-icd/distinfo:1.1        Thu Jun 10 05:55:42 2021
+++ pkgsrc/parallel/ocl-icd/distinfo    Fri Jul  9 18:30:29 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2021/06/10 05:55:42 nia Exp $
+$NetBSD: distinfo,v 1.2 2021/07/09 18:30:29 nia Exp $
 
 SHA1 (ocl-icd-2.3.0.tar.gz) = 4ccf5706c8cf09c63dd56fef57c2bf9c70a5288f
 RMD160 (ocl-icd-2.3.0.tar.gz) = d72a75a2ff12c9cf30f8b91c65782473947ee633
 SHA512 (ocl-icd-2.3.0.tar.gz) = 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
 Size (ocl-icd-2.3.0.tar.gz) = 100848 bytes
+SHA1 (patch-OpenCL.pc.in) = 4cef1fd6d976b4953e7afc8a53d26ce27ef5530b
 SHA1 (patch-icd__generator.rb) = d4522e8b264a3eb944f019e7139598e3ac6dc371
 SHA1 (patch-khronos-headers_CL_cl.h) = 016b3e07fc529b104530d29826b1375e8b0c4745
 SHA1 (patch-khronos-headers_CL_cl__d3d10.h) = efbd00d2ffae3e24a2d5671835d474f7c813da20
@@ -18,5 +19,6 @@ SHA1 (patch-khronos-headers_CL_cl__layer
 SHA1 (patch-khronos-headers_CL_cl__platform.h) = 4010d874b9c25a8701c52460c8de822cf579c8c2
 SHA1 (patch-khronos-headers_CL_cl__va__api__media__sharing__intel.h) = 98a6605f15a7e583eacae59fd522f94ca01a51e6
 SHA1 (patch-khronos-headers_CL_opencl.h) = 2aa2d9b484252906f0ed82d176a95bb86614c617
+SHA1 (patch-ocl-icd.pc.in) = b484d17599ab9025f027191f10d6e56d2c015772
 SHA1 (patch-ocl__interface.yaml) = 41a400fdb541220de5a296e099bb646b00f189a3
 SHA1 (patch-run__dummy__icd.c) = b60c3b48730402ed8434dd2434e013dd1c26388e

Added files:

Index: pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in
diff -u /dev/null pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in:1.1
--- /dev/null   Fri Jul  9 18:30:29 2021
+++ pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in  Fri Jul  9 18:30:29 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-OpenCL.pc.in,v 1.1 2021/07/09 18:30:29 nia Exp $
+
+Link with libpthread in order to unbreak pocl on NetBSD.
+
+--- OpenCL.pc.in.orig  2021-03-30 16:10:38.000000000 +0000
++++ OpenCL.pc.in
+@@ -6,5 +6,5 @@ includedir=@includedir@
+ Name: OpenCL
+ Description: Open Computing Language generic Installable Client Driver Loader
+ Version: @OPENCL_VERSION@
+-Libs: -L${libdir} -lOpenCL
++Libs: -L${libdir} -lOpenCL -pthread
+ Cflags: -I${includedir}
Index: pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in
diff -u /dev/null pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in:1.1
--- /dev/null   Fri Jul  9 18:30:29 2021
+++ pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in Fri Jul  9 18:30:29 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-ocl-icd.pc.in,v 1.1 2021/07/09 18:30:29 nia Exp $
+
+Link with libpthread in order to unbreak pocl on NetBSD.
+
+--- ocl-icd.pc.in.orig 2021-03-30 16:10:38.000000000 +0000
++++ ocl-icd.pc.in
+@@ -6,5 +6,5 @@ includedir=@includedir@
+ Name: ocl-icd
+ Description: Open Computing Language generic Installable Client Driver support
+ Version: @VERSION@
+-Libs: -L${libdir}
++Libs: -L${libdir} -pthread
+ Cflags: -I${includedir}