Thu Jun 10 11:18:06 2021 UTC ()
pocl: Fix a null pointer dererence if sysfs is not present *sigh*


(nia)
diff -r1.2 -r1.3 pkgsrc/parallel/pocl/Makefile
diff -r1.1 -r1.2 pkgsrc/parallel/pocl/distinfo
diff -r0 -r1.1 pkgsrc/parallel/pocl/patches/patch-lib_CL_devices_cpuinfo.c
cvs diff -r1.2 -r1.3 pkgsrc/parallel/pocl/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/pocl/Makefile 2021/06/10 10:26:32 1.2
+++ pkgsrc/parallel/pocl/Makefile 2021/06/10 11:18:06 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.2 2021/06/10 10:26:32 nia Exp $ 1# $NetBSD: Makefile,v 1.3 2021/06/10 11:18:06 nia Exp $
2 2
3DISTNAME= pocl-1.7 3DISTNAME= pocl-1.7
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= parallel 5CATEGORIES= parallel
6MASTER_SITES= http://portablecl.org/downloads/ 6MASTER_SITES= http://portablecl.org/downloads/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://portablecl.org/ 9HOMEPAGE= http://portablecl.org/
10COMMENT= Portable implementation of the OpenCL standard 10COMMENT= Portable implementation of the OpenCL standard
11LICENSE= mit 11LICENSE= mit
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17# C++11 17# C++11
cvs diff -r1.1 -r1.2 pkgsrc/parallel/pocl/distinfo (expand / switch to unified diff)

--- pkgsrc/parallel/pocl/distinfo 2021/06/10 09:57:40 1.1
+++ pkgsrc/parallel/pocl/distinfo 2021/06/10 11:18:06 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.1 2021/06/10 09:57:40 nia Exp $ 1$NetBSD: distinfo,v 1.2 2021/06/10 11:18:06 nia Exp $
2 2
3SHA1 (pocl-1.7.tar.gz) = 7f28546ac51d89ba699cc5adce1ddf2e91bdf230 3SHA1 (pocl-1.7.tar.gz) = 7f28546ac51d89ba699cc5adce1ddf2e91bdf230
4RMD160 (pocl-1.7.tar.gz) = 75555c802bf133298d615f5c146174dc0f959a72 4RMD160 (pocl-1.7.tar.gz) = 75555c802bf133298d615f5c146174dc0f959a72
5SHA512 (pocl-1.7.tar.gz) = 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38 5SHA512 (pocl-1.7.tar.gz) = 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38
6Size (pocl-1.7.tar.gz) = 1577676 bytes 6Size (pocl-1.7.tar.gz) = 1577676 bytes
7SHA1 (patch-CMakeLists.txt) = 314c492b03d66ab373cc59c926fe3d27aeb3a5a3 7SHA1 (patch-CMakeLists.txt) = 314c492b03d66ab373cc59c926fe3d27aeb3a5a3
8SHA1 (patch-config.h.in.cmake) = 974fad1f19516ef0b73f7db5b3948e677f4aaf98 8SHA1 (patch-config.h.in.cmake) = 974fad1f19516ef0b73f7db5b3948e677f4aaf98
9SHA1 (patch-lib_CL_devices_basic_basic.c) = 9110d868a305cefc2e19fd7d7482f6ce2b8a6164 9SHA1 (patch-lib_CL_devices_basic_basic.c) = 9110d868a305cefc2e19fd7d7482f6ce2b8a6164
10SHA1 (patch-lib_CL_devices_common.c) = c276aa967a1cc79b2bd6029b287b887bdb2b0010 10SHA1 (patch-lib_CL_devices_common.c) = c276aa967a1cc79b2bd6029b287b887bdb2b0010
 11SHA1 (patch-lib_CL_devices_cpuinfo.c) = 70c4948c4948134e05d165ca0e8f6bd6fa68754b
11SHA1 (patch-lib_CL_devices_devices.c) = 17a5bb001086befdf88452b7e1126d2f5f4b1fc1 12SHA1 (patch-lib_CL_devices_devices.c) = 17a5bb001086befdf88452b7e1126d2f5f4b1fc1
12SHA1 (patch-lib_CL_devices_hsa_pocl-hsa.c) = b7b4798b6f47f4d60a914f45ba64fe8448accdb9 13SHA1 (patch-lib_CL_devices_hsa_pocl-hsa.c) = b7b4798b6f47f4d60a914f45ba64fe8448accdb9
13SHA1 (patch-lib_CL_devices_pthread_pthread.c) = afc0ab5544300d141d1fbfe5b7fe18af281365fa 14SHA1 (patch-lib_CL_devices_pthread_pthread.c) = afc0ab5544300d141d1fbfe5b7fe18af281365fa
14SHA1 (patch-lib_CL_pocl__timing.c) = 93b83613973d8128cd5b93375cadd2f6702de7ba 15SHA1 (patch-lib_CL_pocl__timing.c) = 93b83613973d8128cd5b93375cadd2f6702de7ba
File Added: pkgsrc/parallel/pocl/patches/Attic/patch-lib_CL_devices_cpuinfo.c
$NetBSD: patch-lib_CL_devices_cpuinfo.c,v 1.1 2021/06/10 11:18:06 nia Exp $

Do not segfault if /sys/bus/pci/devices/0000:00:00.0/vendor does not exist.

--- lib/CL/devices/cpuinfo.c.orig	2021-05-19 08:12:19.000000000 +0000
+++ lib/CL/devices/cpuinfo.c
@@ -416,9 +416,12 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_
   if (!device->vendor_id)
     {
       f = fopen (pci_bus_root_vendor_file, "r");
-      num_read = fscanf (f, "%x", &device->vendor_id);
-      fclose (f);
-      /* no error checking, if it failed we just won't have the info */
+      if (f)
+        {
+          /* no error checking, if it failed we just won't have the info */
+          num_read = fscanf (f, "%x", &device->vendor_id);
+          fclose (f);
+        }
     }
 }