[pocl] 01/18: patch out the path from pocl.icd

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to annotated tag debian/0.14-1
in repository pocl.

commit c92353500687ee7a7b374ef4a7e499b2acc79df0
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Dec 8 21:47:14 2017 +0100

    patch out the path from pocl.icd
---
 debian/patches/no-path-in-pocl.icd.patch | 14 ++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  2 --
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/no-path-in-pocl.icd.patch b/debian/patches/no-path-in-pocl.icd.patch
new file mode 100644
index 0000000..5ab243b
--- /dev/null
+++ b/debian/patches/no-path-in-pocl.icd.patch
@@ -0,0 +1,14 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: remove the path from pocl.icd
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -929,7 +929,7 @@ rename_if_different("${CMAKE_BINARY_DIR}
+ ##########################################################
+ 
+ if(ENABLE_ICD)
+-  file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/pocl.icd" CONTENT "${POCL_INSTALL_PUBLIC_LIBDIR}/$<TARGET_FILE_NAME:pocl>" CONDITION 1)
++  file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/pocl.icd" CONTENT "$<TARGET_FILE_NAME:pocl>" CONDITION 1)
+   install(FILES "${CMAKE_BINARY_DIR}/pocl.icd"
+          DESTINATION "${POCL_INSTALL_ICD_VENDORDIR}")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 49d9a24..e563343 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ libstdc++-7-dev.patch
 cmake-no-fno-rtti.patch
 cmake-no-llvm-sys-getHostCPUName.patch
 cmake-forcibly-link-regtests-with-pthread.patch
+no-path-in-pocl.icd.patch
diff --git a/debian/rules b/debian/rules
index b76bcd6..18e1542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,8 +70,6 @@ override_dh_shlibdeps:
 	dh_shlibdeps -a -- --warnings=7
 
 override_dh_install:
-	sed -i debian/tmp/etc/OpenCL/vendors/pocl.icd \
-		-e 's,.*/\([^/.]*\.so\.[^/.]*\)\.[^/]*,\1,'
 	dh_install -Xusr/include/CL/ -X.la -Xusr/include/utlist.h
 
 override_dh_missing:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git