[pocl] 02/04: Merge branch 'master' into 0.14

Tue Dec 5 17:33:21 UTC 2017

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

hertzog pushed a commit to branch 0.14
in repository pocl.

commit 489cccf33da2bab5cfebc413d8461f4d8e458058
Merge: 26b1b15 fb5b68c
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Tue Dec 5 17:50:29 2017 +0100

    Merge branch 'master' into 0.14

 debian/changelog                                   |    42 +
 debian/clean                                       |     2 +
 debian/control                                     |    11 +-
 debian/libpocl1.symbols                            | 14389 +------------------
 ...cmake-forcibly-link-regtests-with-pthread.patch |    28 +
 debian/patches/cmake-no-fno-rtti.patch             |    20 +
 debian/patches/cmake-no-get_cpu_name.patch         |    44 +
 .../consistent-newlines-in-POCL_ABORT.patch        |   185 +
 debian/patches/do-not-export-clang-symbols.patch   |    23 +
 debian/patches/fix-tests-i386.patch                |    11 +
 debian/patches/libstdc++-7-dev.patch               |     4 +-
 debian/patches/series                              |     6 +
 .../set-POCL_DEVICE_ADDRESS_BITS-before-use.patch  |    45 +
 debian/rules                                       |    42 +-
 14 files changed, 459 insertions(+), 14393 deletions(-)

diff --cc debian/changelog
index edb3ecf,2346499..5a01091

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,45 +1,58 @@@
 +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-13) experimental; urgency=medium
+ 
+   * Fix cmake i386 detection, thanks to James Price.  (Closes: #882875)
+ 
+  -- Andreas Beckmann <anbe at debian.org>  Tue, 28 Nov 2017 03:04:06 +0100
+ 
+ pocl (0.13-12) experimental; urgency=medium
+ 
+   * Switch to cmake build system.
+   * llvmopencl.so.7 is now a private library.  (Closes: #823528)
+   * cmake-no-fno-rtti.patch: Build without -fno-rtti (a workaround for
+     clang-3.7), like autotools, to avoid symbol changes.
+   * cmake-no-get_cpu_name.patch: Do not use get_cpu_name(), makes some tests
+     fail.
+   * cmake-forcibly-link-regtests-with-pthread.patch: Link regression tests
+     with -lpthread unconditionally, otherwise test_issue_231 fails.
+   * Upload to experimental.
+ 
+  -- Andreas Beckmann <anbe at debian.org>  Mon, 27 Nov 2017 16:01:58 +0100
+ 
+ pocl (0.13-11) unstable; urgency=medium
+ 
+   * Add Built-Using control field for linking against static clang libraries.
+   * do-not-export-clang-symbols.patch: Link static clang libraries with
+     --exclude-libs to not export their symbols.
+   * Update symbols files.
+ 
+  -- Andreas Beckmann <anbe at debian.org>  Sun, 26 Nov 2017 19:22:48 +0100
+ 
+ pocl (0.13-10) unstable; urgency=medium
+ 
+   * Update symbols files.
+   * Bump Standards-Version to 4.1.1, no changes needed.
+   * Use dpkg makefile snippets instead of parsing the changelog manually.
+   * Switch B-D-I: python-sphinx to python3-sphinx.
+   * Set Rules-Requires-Root: no.
+   * set-POCL_DEVICE_ADDRESS_BITS-before-use.patch: Fix use-before-init in
+     CMakeLists.txt causing i386 to be misdetected as x86_64.
+   * Do not export libOpenCL.so.1 symbols.
+ 
+  -- Andreas Beckmann <anbe at debian.org>  Sat, 25 Nov 2017 21:03:13 +0100
+ 
  pocl (0.13-9) unstable; urgency=medium
  
    * Work around using clang-3.8 with libstdc++-7-dev.  (Closes: #853620)
diff --cc debian/control
index a990940,28b7467..7c3e68d
--- a/debian/control
+++ b/debian/control
@@@ -11,14 -11,17 +11,17 @@@ Build-Depends: debhelper (>= 10)
   ocl-icd-dev (>= 2.2.3),
   ocl-icd-libopencl1 (>= 2.2.3),
   ocl-icd-opencl-dev,
 - clang-3.8,
 - llvm-3.8-dev (>= 1:3.8),
 - libclang-3.8-dev,
 + clang,
 + llvm-dev (>= 1:3.8),
 + libclang-dev,
   pkg-kde-tools,
   sphinx-common,
+  zlib1g-dev,
+  cmake,
  Build-Depends-Indep:
-  python-sphinx,
- Standards-Version: 4.0.1
+  python3-sphinx,
+ Rules-Requires-Root: no
+ Standards-Version: 4.1.1
  Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/pocl.git
  Vcs-Git: https://anonscm.debian.org/git/collab-maint/pocl.git
  Homepage: http://portablecl.org
diff --cc debian/patches/series
index 85d74c8,5f2e515..8090a38
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,14 +1,11 @@@
  os-compat.patch
 -fix-configure-for-debian-archs.patch
 -llvm-system-libs.patch
  typos.patch
  fix-tests-i386.patch
 -find-sys-cdefs-h.patch
  glibc-2.23.patch
+ set-POCL_DEVICE_ADDRESS_BITS-before-use.patch
+ consistent-newlines-in-POCL_ABORT.patch
+ do-not-export-clang-symbols.patch
  libstdc++-7-dev.patch
+ cmake-no-fno-rtti.patch
+ cmake-no-get_cpu_name.patch
+ cmake-forcibly-link-regtests-with-pthread.patch
diff --cc debian/rules
index 3d56d42,b76bcd6..0ce9c0c
--- a/debian/rules
+++ b/debian/rules
@@@ -51,10 -56,8 +56,9 @@@ 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
 +
 +override_dh_auto_configure:
- 	dh_auto_configure -- -DENABLE_ICD=1 \
- 		-DWITH_LLVM_CONFIG=/usr/bin/llvm-config-$(LLVM_VERSION)
+ 	dh_auto_configure -- $(POCL_CONFIGURE_FLAGS)
  
  override_dh_auto_build-indep:
  ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))

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

