[pocl] 06/10: build with -DPOCL_ICD_ABSOLUTE_PATH=OFF

[Andreas Beckmann]

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

anbe pushed a commit to branch 1.0
in repository pocl.

commit fba3f7428ded501f0fd6ffa8b652076c1148b080
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Dec 8 20:29:26 2017 +0100

    build with -DPOCL_ICD_ABSOLUTE_PATH=OFF
---
 debian/changelog                                        |  1 +
 debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch | 14 --------------
 debian/patches/no-path-in-pocl.icd.patch                | 14 --------------
 debian/patches/series                                   |  2 --
 debian/rules                                            |  1 +
 5 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5428155..0335735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pocl (1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refresh/remove patches.
+  * Build with -DPOCL_ICD_ABSOLUTE_PATH=OFF.
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 17 Jan 2018 06:34:27 +0100
 
diff --git a/debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch b/debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch
deleted file mode 100644
index 043a653..0000000
--- a/debian/patches/cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Andreas Beckmann <anbe at debian.org>
-Description: use CMAKE_INSTALL_SYSCONFDIR for /etc
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -146,7 +146,7 @@ set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE
- if(UNIX AND NOT CMAKE_CROSSCOMPILING AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-   set(POCL_INSTALL_ICD_VENDORDIR "/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
- else()
--  set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
-+  set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_SYSCONFDIR}/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
- endif()
- 
- # for kernel-<target>.bc
diff --git a/debian/patches/no-path-in-pocl.icd.patch b/debian/patches/no-path-in-pocl.icd.patch
deleted file mode 100644
index 5ab243b..0000000
--- a/debian/patches/no-path-in-pocl.icd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 3c9213c..3fd532e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,4 @@ consistent-newlines-in-POCL_ABORT.patch
 do-not-export-clang-symbols.patch
 cmake-no-fno-rtti.patch
 cmake-no-llvm-sys-getHostCPUName.patch
-no-path-in-pocl.icd.patch
-cmake-use-CMAKE_INSTALL_SYSCONFDIR.patch
 printf-passes-for-i686.patch
diff --git a/debian/rules b/debian/rules
index 69d4f3e..4053816 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@ POCL_CONFIGURE_FLAGS	 =
 POCL_CONFIGURE_FLAGS	+= -DENABLE_ICD=yes
 POCL_CONFIGURE_FLAGS	+= -DWITH_LLVM_CONFIG=/usr/bin/llvm-config-$(LLVM_VERSION)
 POCL_CONFIGURE_FLAGS	+= -DLLC_HOST_CPU=$(LLC_HOST_CPU)
+POCL_CONFIGURE_FLAGS	+= -DPOCL_ICD_ABSOLUTE_PATH=OFF
 
 override_dh_auto_configure:
 ifeq ($(LLVM_ARCH),)

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