[pocl] 01/07: switch to the cmake buildsystem

Andreas Beckmann anbe at moszumanska.debian.org
Mon Nov 27 17:09:59 UTC 2017


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

anbe pushed a commit to branch experimental
in repository pocl.

commit ea87eec64e236c777a122c942120daad714b20c3
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Nov 26 21:38:35 2017 +0100

    switch to the cmake buildsystem
---
 debian/changelog |  6 ++++++
 debian/control   |  1 +
 debian/rules     | 14 +++++---------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 440840e..7902451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pocl (0.13-12) UNRELEASED; urgency=medium
+
+  * Switch to cmake build system.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 26 Nov 2017 21:37:57 +0100
+
 pocl (0.13-11) unstable; urgency=medium
 
   * Add Built-Using control field for linking against static clang libraries.
diff --git a/debian/control b/debian/control
index e1fc817..28b7467 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 10),
  pkg-kde-tools,
  sphinx-common,
  zlib1g-dev,
+ cmake,
 Build-Depends-Indep:
  python3-sphinx,
 Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index bfc0474..ef0df01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,26 +41,22 @@ 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 $@ --with pkgkde_symbolshelper --with sphinxdoc --buildsystem=cmake
 
 .PHONY: override_dh_auto_configure override_dh_shlibdeps override_dh_install
 .PHONY: override_dh_auto_test override_dh_makeshlibs
 
 POCL_CONFIGURE_FLAGS	 =
-POCL_CONFIGURE_FLAGS	+= --enable-icd
-POCL_CONFIGURE_FLAGS	+= --disable-static
-POCL_CONFIGURE_FLAGS	+= --disable-direct-linkage
-POCL_CONFIGURE_FLAGS	+= LLVM_CONFIG=/usr/bin/llvm-config-$(LLVM_VERSION)
+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)
 
-override_dh_autoreconf:
+override_dh_auto_configure:
 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 -- $(POCL_CONFIGURE_FLAGS)
 
 override_dh_auto_build-indep:

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



More information about the Pkg-opencl-commits mailing list