[pocl] 01/04: Switch to cmake build system

[Raphaël Hertzog]

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

hertzog pushed a commit to branch 0.14
in repository pocl.

commit 26b1b15a0e285d8985eea75464e5eed0b57017e9
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Tue Dec 5 17:45:49 2017 +0100

    Switch to cmake build system
    
    Thanks to James Price for the patch.
---
 debian/changelog               |  4 ++++
 debian/pocl-opencl-icd.install |  2 +-
 debian/rules                   | 10 ++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d185cf4..edb3ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 pocl (0.14-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * New upstream version
   * Drop versioned LLVM dependency
     Closes: #873417
 
+  [ Raphaël Hertzog ]
+  * Switch to cmake build system (thanks to James Price for the patch).
+
  -- Andreas Tille <tille at debian.org>  Tue, 21 Nov 2017 08:23:34 +0100
 
 pocl (0.13-9) unstable; urgency=medium
diff --git a/debian/pocl-opencl-icd.install b/debian/pocl-opencl-icd.install
index 6549149..f372c08 100644
--- a/debian/pocl-opencl-icd.install
+++ b/debian/pocl-opencl-icd.install
@@ -1 +1 @@
-etc/OpenCL/vendors/pocl.icd
+usr/etc/OpenCL/vendors/pocl.icd etc/OpenCL/vendors
diff --git a/debian/rules b/debian/rules
index 3aa4d0b..3d56d42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ endif
 # http://www.eyrie.org/~eagle/journal/2012-01/008.html
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with pkgkde_symbolshelper --with sphinxdoc
+	dh $@ --buildsystem=cmake --with pkgkde_symbolshelper --with sphinxdoc
 
 .PHONY: override_dh_auto_configure override_dh_shlibdeps override_dh_install
 .PHONY: override_dh_auto_test override_dh_makeshlibs
@@ -51,12 +51,10 @@ ifeq ($(LLVM_ARCH),)
 	$(warning Experimental architecture. Build failure expected)
 endif
 	@echo Using LLC_HOST_CPU=$${LLC_HOST_CPU}
-	-/usr/lib/llvm-$(LLVM_VERSION)/bin/llc -mattr=help
-	dh_autoreconf --as-needed autoreconf -- -vif -Wall -Wno-obsolete
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-icd --disable-static \
-		LLVM_CONFIG=/usr/bin/llvm-config-$(LLVM_VERSION)
+	dh_auto_configure -- -DENABLE_ICD=1 \
+		-DWITH_LLVM_CONFIG=/usr/bin/llvm-config-$(LLVM_VERSION)
 
 override_dh_auto_build-indep:
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
@@ -69,7 +67,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps -a -- --warnings=7
 
 override_dh_install:
-	sed -i debian/tmp/etc/OpenCL/vendors/pocl.icd \
+	sed -i debian/tmp/usr/etc/OpenCL/vendors/pocl.icd \
 		-e 's,.*/\([^/.]*\.so\.[^/.]*\)\.[^/]*,\1,'
 	dh_install -Xusr/include/CL/ -X.la -Xusr/include/utlist.h
 

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