[SCM] ViennaCL packaging branch, master, updated. debian/1.1.2-6-25-gde41d72

Michael Wild themiwi at users.sourceforge.net
Mon Feb 27 09:56:03 UTC 2012


The following commit has been merged in the master branch:
commit de41d72582941e31b3fcd5232f527f56810f65b4
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Mon Feb 27 08:56:25 2012 +0100

    Fix code and build of debian/test_compute_capability.c
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/rules b/debian/rules
index e484361..ae16c09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,9 @@ override_dh_auto_install:
 	dh_auto_install
 
 $(BUILDDIR)/test_compute_capability: debian/test_compute_capability.c
-	gcc -o $@ -lOpenCL $^
+	gcc -o $@ `dpkg-buildflags --get CFLAGS`                              \
+	  `dpkg-buildflags --get LDFLAGS` -I/usr/include/nvidia-current $^    \
+	  -lOpenCL
 
 get-orig-source:
 	TMPDIR=`mktemp -d`;                                                   \
diff --git a/debian/test_compute_capability.c b/debian/test_compute_capability.c
index b1082de..7e27f66 100644
--- a/debian/test_compute_capability.c
+++ b/debian/test_compute_capability.c
@@ -1,13 +1,13 @@
 #include <stdio.h>
-#include <CL/opencl.h>
+#include <CL/cl.h>
 
 int main()
 {
   cl_platform_id pform_id;
   if (clGetPlatformIDs(1, &pform_id, NULL) == CL_SUCCESS)
   {
-    cl_int ndevices;
-    if (clGetDeviceIDs(pform_id, CL_DEVICE_TYPE_ALL, 0, NULL, &ndevices) != CL_SUCCESS)
+    cl_uint ndevices;
+    if (clGetDeviceIDs(pform_id, CL_DEVICE_TYPE_ALL, 0, NULL, &ndevices) == CL_SUCCESS)
     {
       return 0;
     }

-- 
ViennaCL packaging



More information about the debian-science-commits mailing list