[pocl] 07/18: the autotools based build system is gone
Andreas Beckmann
anbe at moszumanska.debian.org
Thu Dec 14 01:54:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to annotated tag debian/0.14-1
in repository pocl.
commit 226ea74d7140858f17c9aff9bec3f723333e2a36
Author: Andreas Beckmann <anbe at debian.org>
Date: Fri Dec 8 18:35:56 2017 +0100
the autotools based build system is gone
---
debian/changelog | 1 +
debian/clean | 1 -
debian/patches/do-not-export-clang-symbols.patch | 10 ----
debian/patches/find-sys-cdefs-h.patch | 59 ----------------------
.../patches/fix-configure-for-debian-archs.patch | 41 ---------------
debian/patches/fix-tests-i386.patch | 11 ----
debian/patches/llvm-system-libs.patch | 33 ------------
debian/patches/series | 3 --
8 files changed, 1 insertion(+), 158 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 58e364a..3d2c4f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pocl (0.14-1) UNRELEASED; urgency=medium
* New upstream release.
+ * The autotools based build system is gone.
-- Andreas Beckmann <anbe at debian.org> Sun, 26 Nov 2017 22:29:33 +0100
diff --git a/debian/clean b/debian/clean
index 4107428..12f2060 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,3 @@
-autom4te.cache/
include/CL/cl.hpp
include/CL/cl.hpp.patched
diff --git a/debian/patches/do-not-export-clang-symbols.patch b/debian/patches/do-not-export-clang-symbols.patch
index 033c822..44e5373 100644
--- a/debian/patches/do-not-export-clang-symbols.patch
+++ b/debian/patches/do-not-export-clang-symbols.patch
@@ -11,13 +11,3 @@ Description: use --exclude-libs to not export symbols from static clang librarie
endforeach()
# With Visual Studio llvm-config gives invalid list of static libs (libXXXX.a instead of XXXX.lib)
---- a/lib/CL/Makefile.am
-+++ b/lib/CL/Makefile.am
-@@ -187,6 +187,7 @@ libpocl_la_LDFLAGS += @LLVM_LDFLAGS@
- AM_CXXFLAGS = @PTHREAD_CFLAGS@ @LLVM_CXX_FLAGS@
-
- libpocl_la_LDFLAGS += -L${top_builddir}/lib/CL/ @ICD_LD_FLAGS@
-+libpocl_la_LDFLAGS += -Wl,--exclude-libs,libclangFrontend:libclangDriver:libclangParse:libclangSema:libclangEdit:libclangLex:libclangSerialization:libclangAST:libclangBasic:libclangFrontendTool:libclangRewriteFrontend:libclangStaticAnalyzerFrontend:libclangStaticAnalyzerCore:libclangAnalysis:libclangCodeGen:libclangASTMatchers
- libpocl_la_LIBADD += libpoclllvm.la
- libpocl_la_LIBADD += ${top_builddir}/lib/llvmopencl/libllvmpasses.la
- libpocl_la_LIBADD += -lclangFrontend -lclangDriver -lclangParse -lclangSema -lclangEdit -lclangLex -lclangSerialization
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 5a940fc..ebe45c8 100644
--- a/debian/patches/fix-tests-i386.patch
+++ b/debian/patches/fix-tests-i386.patch
@@ -1,17 +1,6 @@
Author: Andreas Beckmann <anbe at debian.org>
Description: also skip test on i586 CPU
---- a/tests/testsuite.at
-+++ b/tests/testsuite.at
-@@ -88,7 +88,7 @@ AT_CLEANUP
-
- AT_SETUP([Kernel functions printf])
- # On 32-bit x86, accessing int4 via va_arg segfaults (wrong alignment?)
--AT_XFAIL_IF([grep HOST_CPU $abs_top_builddir/config.h | cut -d\" -f2 | grep -q i686])
-+AT_XFAIL_IF([grep HOST_CPU $abs_top_builddir/config.h | cut -d\" -f2 | grep -q i.86])
- AT_XFAIL_IF([egrep -q "#define LLVM_3_2|#define LLVM_3_3" $abs_top_builddir/config.h])
- AT_KEYWORDS([printf])
- AT_CHECK_UNQUOTED([$abs_top_builddir/tests/kernel/kernel test_printf], 0,
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a
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/series b/debian/patches/series
index e563343..3238958 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
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
--
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