From b100608c9f919906ea4675bcaae0603827bf662a Mon Sep 17 00:00:00 2001 From: nia Date: Fri, 9 Jul 2021 18:30:29 +0000 Subject: ocl-icd: Link with -pthread to fix pocl on NetBSD --- parallel/ocl-icd/Makefile | 7 +++++-- parallel/ocl-icd/distinfo | 4 +++- parallel/ocl-icd/patches/patch-OpenCL.pc.in | 13 +++++++++++++ parallel/ocl-icd/patches/patch-ocl-icd.pc.in | 13 +++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 parallel/ocl-icd/patches/patch-OpenCL.pc.in create mode 100644 parallel/ocl-icd/patches/patch-ocl-icd.pc.in (limited to 'parallel') diff --git a/parallel/ocl-icd/Makefile b/parallel/ocl-icd/Makefile index c6f3a0aa4e3..8fbdf3f2c8d 100644 --- a/parallel/ocl-icd/Makefile +++ b/parallel/ocl-icd/Makefile @@ -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-vendordir=${PKG_SYSCONFDIR}/OpenCL/vendors 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 diff --git a/parallel/ocl-icd/distinfo b/parallel/ocl-icd/distinfo index 4b7f1f30039..b49f1e26fdb 100644 --- a/parallel/ocl-icd/distinfo +++ b/parallel/ocl-icd/distinfo @@ -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.h) = d1b0ae935c4eed12076d7e4da956626e38 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 diff --git a/parallel/ocl-icd/patches/patch-OpenCL.pc.in b/parallel/ocl-icd/patches/patch-OpenCL.pc.in new file mode 100644 index 00000000000..c050858f230 --- /dev/null +++ b/parallel/ocl-icd/patches/patch-OpenCL.pc.in @@ -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} diff --git a/parallel/ocl-icd/patches/patch-ocl-icd.pc.in b/parallel/ocl-icd/patches/patch-ocl-icd.pc.in new file mode 100644 index 00000000000..b2f561acdc7 --- /dev/null +++ b/parallel/ocl-icd/patches/patch-ocl-icd.pc.in @@ -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} -- cgit v1.2.3