[pocl] 02/02: Try building with 0.14 to fix #873417
Andreas Tille
tille at debian.org
Tue Nov 21 07:57:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch 0.14
in repository pocl.
commit 3da50c3449c28a7cbb598f93be9814307859eae0
Author: Andreas Tille <tille at debian.org>
Date: Tue Nov 21 10:51:52 2017 +0100
Try building with 0.14 to fix #873417
---
debian/changelog | 9 ++++
debian/control | 6 +--
debian/patches/find-sys-cdefs-h.patch | 59 ----------------------
.../patches/fix-configure-for-debian-archs.patch | 41 ---------------
debian/patches/fix-tests-i386.patch | 2 +-
debian/patches/llvm-system-libs.patch | 33 ------------
debian/patches/os-compat.patch | 14 ++---
debian/patches/series | 3 --
debian/patches/typos.patch | 13 +----
debian/rules | 2 +-
10 files changed, 20 insertions(+), 162 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 34e06d2..d185cf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pocl (0.14-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Drop versioned LLVM dependency
+ Closes: #873417
+
+ -- Andreas Tille <tille at debian.org> Tue, 21 Nov 2017 08:23:34 +0100
+
pocl (0.13-9) unstable; urgency=medium
* Work around using clang-3.8 with libstdc++-7-dev. (Closes: #853620)
diff --git a/debian/control b/debian/control
index 8671d41..a990940 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ 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,
Build-Depends-Indep:
diff --git a/debian/patches/find-sys-cdefs-h.patch b/debian/patches/find-sys-cdefs-h.patch
deleted file mode 100644
index 4c48cab..0000000
--- a/debian/patches/find-sys-cdefs-h.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Andreas Beckmann <anbe at debian.org>
-Description: work around clang failing to find sys/cdefs.h
- see #806241 for the clang-3.6 bug
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -709,6 +709,43 @@ else
- fi
- AC_MSG_RESULT(${CLANG_TARGET_OPTION}TARGET)
-
-+HOST_CLANG_CPPFLAGS=
-+
-+old_CC=$CC
-+CC=$CLANG
-+old_CFLAGS=$CFLAGS
-+old_LDFLAGS=$LDFLAGS
-+old_LIBS=$LIBS
-+AC_LANG_PUSH([C])
-+
-+AC_MSG_CHECKING([Clang flags for compiling features.h])
-+success=no
-+
-+for candidate in "" "-I/usr/include/$DEB_HOST_MULTIARCH"
-+do
-+ CFLAGS="${CLANG_TARGET_OPTION}$host $HOST_CLANG_CPPFLAGS $candidate"
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [[ #include <features.h> ]],
-+ [[ ]]
-+ )],
-+ [AC_MSG_RESULT(${candidate:-none})
-+ HOST_CLANG_CPPFLAGS="$HOST_CLANG_CPPFLAGS $candidate"
-+ success=yes
-+ break
-+ ],[])
-+done
-+
-+if test x$success != xyes ; then
-+ AC_MSG_ERROR([Clang cannot compile features.h])
-+fi
-+
-+AC_LANG_POP([C])
-+CC=$old_CC
-+CFLAGS=$old_CFLAGS
-+LDFLAGS=$old_LDFLAGS
-+LIBS=$old_LIBS
-+
- # Check for a functioning clang++. It is needed to compile faster math
- # builtins from vecmathlib.
- LLVM_PROG_WARN([CLANGXX], [clang++])
-@@ -844,7 +881,7 @@ else
- fi
- AC_MSG_RESULT($LD_SHARED)
-
--HOST_CLANG_FLAGS=""
-+HOST_CLANG_FLAGS="$HOST_CLANG_CPPFLAGS"
- HOST_LLC_FLAGS="-relocation-model=pic"
- HOST_AS_FLAGS=""
- HOST_LD_FLAGS="$LD_SHARED"
diff --git a/debian/patches/fix-configure-for-debian-archs.patch b/debian/patches/fix-configure-for-debian-archs.patch
deleted file mode 100644
index ae93225..0000000
--- a/debian/patches/fix-configure-for-debian-archs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix architecture name for ARM on Debian
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -953,6 +953,14 @@ case $host_cpu in
- # for compiling kernels for ARM envs without usable math libs.
- CL_DEVICE_ADDRESS_BITS=32
- ;;
-+
-+ aarch64*)
-+ AC_MSG_NOTICE([using the aarch64 optimized kernel lib for the native device])
-+ HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
-+ CLANG_MARCH_FLAG=mcpu
-+ CL_DEVICE_ADDRESS_BITS=64
-+ ;;
-+
- amd64|x86_64)
- AC_MSG_NOTICE([using the x86_64 optimized kernel lib for the native device])
- HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
-@@ -975,7 +983,7 @@ case $host_cpu in
- AC_MSG_NOTICE([using the ppc64 optimized kernel lib for the native device])
- HOST_LD_FLAGS="$HOST_LD_FLAGS -lm"
- llc_triple="powerpc64-unknown-linux-gnu"
-- CL_DEVICE_ADDRESS_BITS=32
-+ CL_DEVICE_ADDRESS_BITS=64
- #TODO: not all PowerPCs have Altivec?
- HOST_LLC_FLAGS="$HOST_LLC_FLAGS -mattr=altivec"
- CLANG_MARCH_FLAG="mcpu"
-@@ -1001,6 +1009,12 @@ case $host_cpu in
- CL_DEVICE_ADDRESS_BITS=32
- ;;
-
-+ mips64el*)
-+ llc_triple="mips64el-unknown-linux-gnuabi64"
-+ CLANG_MARCH_FLAG=mcpu
-+ CL_DEVICE_ADDRESS_BITS=64
-+ ;;
-+
- mips*)
- llc_triple="mips-unknown-linux-gnu"
- CLANG_MARCH_FLAG=mcpu
diff --git a/debian/patches/fix-tests-i386.patch b/debian/patches/fix-tests-i386.patch
index 33a5ff0..accf7b8 100644
--- a/debian/patches/fix-tests-i386.patch
+++ b/debian/patches/fix-tests-i386.patch
@@ -3,7 +3,7 @@ Description: also skip test on i586 CPU
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
-@@ -87,7 +87,7 @@ AT_CLEANUP
+@@ -88,7 +88,7 @@ AT_CLEANUP
AT_SETUP([Kernel functions printf])
# On 32-bit x86, accessing int4 via va_arg segfaults (wrong alignment?)
diff --git a/debian/patches/llvm-system-libs.patch b/debian/patches/llvm-system-libs.patch
deleted file mode 100644
index b05c206..0000000
--- a/debian/patches/llvm-system-libs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Andreas Beckmann <anbe at debian.org>
-Description: llvm-config --system-libs is only needed with static llvm
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,7 @@ LLVM_VERSION=`$LLVM_CONFIG --version`
- LLVM_BINDIR=`$LLVM_CONFIG --bindir`
- LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
- LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
-+LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs`
-
- AC_SUBST([LLVM_VERSION], [$LLVM_VERSION])
- AC_DEFINE_UNQUOTED([LLVM_VERSION], ["$LLVM_VERSION"], "LLVM version as a string.")
-@@ -93,11 +94,9 @@ AC_DEFINE_UNQUOTED([LLVM_VERSION], ["$LL
- case "$LLVM_VERSION" in
- 3.7*)
- AC_DEFINE([LLVM_3_7], [], "Using LLVM 3.7")
-- LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
- ;;
- 3.8*)
- AC_DEFINE([LLVM_3_8], [], "Using LLVM 3.8")
-- LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
- ;;
- *)
- AC_MSG_ERROR(
-@@ -122,6 +121,7 @@ AC_ARG_ENABLE([static-llvm],
- LLVM_SHARED_LIB_FILE=$LLVM_LIBDIR/libLLVM-$LLVM_VERSION$LIBRARY_SUFFIX
-
- if test "$link_llvm_static" = "yes"; then
-+ LLVM_LDFLAGS="$LLVM_LDFLAGS $LLVM_SYSTEM_LIBS"
- LLVM_LIBS=$($LLVM_CONFIG --libfiles)
- else
- LLVM_LIBS=-lLLVM-$LLVM_VERSION
diff --git a/debian/patches/os-compat.patch b/debian/patches/os-compat.patch
index 0cf3380..3e1b9e9 100644
--- a/debian/patches/os-compat.patch
+++ b/debian/patches/os-compat.patch
@@ -13,16 +13,12 @@ Description: Fix includes for FreeBSD and GNU/Hurd
-#include <emmintrin.h>
--- a/lib/CL/pocl_timing.c
+++ b/lib/CL/pocl_timing.c
-@@ -67,10 +67,10 @@ uint64_t pocl_gettimemono_ns() {
- struct timespec timespec;
- # ifdef __linux__
- clock_gettime(CLOCK_MONOTONIC_RAW, ×pec);
+@@ -72,7 +72,7 @@ uint64_t pocl_gettimemono_ns() {
+ # warning Using clock_gettime with CLOCK_MONOTONIC for monotonic clocks
+ clock_gettime(CLOCK_MONOTONIC, ×pec);
+ # endif
-# elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
clock_gettime(CLOCK_UPTIME_FAST, ×pec);
# else
--# warn Using clock_gettime with CLOCK_REALTIME for monotonic clocks
-+# warning Using clock_gettime with CLOCK_REALTIME for monotonic clocks
- clock_gettime(CLOCK_REALTIME, ×pec);
- # endif
- return ((timespec.tv_sec * 1000000000UL) + timespec.tv_nsec);
+ # warning Using clock_gettime with CLOCK_REALTIME for monotonic clocks
diff --git a/debian/patches/series b/debian/patches/series
index bbab446..85d74c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
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
libstdc++-7-dev.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 12fcfbb..c1b17d5 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -3,7 +3,7 @@ Description: fix typos found by lintian
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -176,7 +176,7 @@ endif()
+@@ -269,7 +269,7 @@ endif()
######################################################################################
@@ -12,14 +12,3 @@ Description: fix typos found by lintian
# also, if DEFAULT_FEATURE_X is 0, prevents FEATURE_X being 1
# since it takes DEFAULT_FEATURE_X=0 to mean "FEATURE_X is unavailable"
macro(setup_cached_var VARNAME DESCRIPTION DOCS_FEATURE_IS_UNAVAILABLE DOCS_REQUESTED_DISABLING_FEATURE)
---- a/lib/CL/clBuildProgram.c
-+++ b/lib/CL/clBuildProgram.c
-@@ -152,7 +152,7 @@ CL_API_SUFFIX__VERSION_1_0
- }
- else if (strstr (cl_parameters_not_yet_supported_by_clang, token))
- {
-- APPEND_TO_MAIN_BUILD_LOG("Build option isnt yet supported by clang: %s\n", token);
-+ APPEND_TO_MAIN_BUILD_LOG("Build option isn't yet supported by clang: %s\n", token);
- token = strtok_r (NULL, " ", &saveptr);
- continue;
- }
diff --git a/debian/rules b/debian/rules
index e859c62..3aa4d0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/dpkg/default.mk
# When updating this variable, do not forget to adapt the build-depends
# in debian/control
-LLVM_VERSION=3.8
+LLVM_VERSION=4.0
# see FEATURE AREAS in dpkg-buildflags(1)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
--
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