From b8c69dda68a33a1f4dd3e2aa7903d870ca548f8e95707001f899c8b6dd7b50c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Mon, 4 Jul 2016 19:15:29 +0000
Subject: [PATCH 1/2] Accepting request 406457 from
 home:mnhauke:branches:science

- Add patch: 0001-Fixes-357-broken-build-with-GCC-6.1.patch
  * Fix build with GCC 6.x

OBS-URL: https://build.opensuse.org/request/show/406457
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=9
---
 ...-Fixes-357-broken-build-with-GCC-6.1.patch | 26 +++++++++++++++++++
 pocl.changes                                  |  6 +++++
 pocl.spec                                     |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 0001-Fixes-357-broken-build-with-GCC-6.1.patch

diff --git a/0001-Fixes-357-broken-build-with-GCC-6.1.patch b/0001-Fixes-357-broken-build-with-GCC-6.1.patch
new file mode 100644
index 0000000..953e6e1
--- /dev/null
+++ b/0001-Fixes-357-broken-build-with-GCC-6.1.patch
@@ -0,0 +1,26 @@
+diff --git a/cmake/bitcode_rules.cmake b/cmake/bitcode_rules.cmake
+index dd6853b..708ba24 100644
+--- a/cmake/bitcode_rules.cmake
++++ b/cmake/bitcode_rules.cmake
+@@ -62,7 +62,7 @@ function(compile_cc_to_bc FILENAME SUBDIR BC_FILE_LIST)
+         DEPENDS "${FULL_F_PATH}"
+           ${KERNEL_DEPEND_HEADERS}
+         COMMAND  "${CLANGXX}" ${CLANG_FLAGS} ${KERNEL_CLANGXX_FLAGS}
+-        ${DEVICE_CL_FLAGS} "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
++        ${DEVICE_CL_FLAGS} "-std=c++11" "-o" "${BC_FILE}" "-c" "${FULL_F_PATH}"
+         COMMENT "Building C++ to LLVM bitcode ${BC_FILE}" 
+         VERBATIM)
+ endfunction()
+diff --git a/lib/kernel/rules.mk b/lib/kernel/rules.mk
+index 27bc9d4..aa9912c 100644
+--- a/lib/kernel/rules.mk
++++ b/lib/kernel/rules.mk
+@@ -74,7 +74,7 @@ _kernel.h.pch: @top_builddir@/include/${TARGET_DIR}/types.h @top_srcdir@/include
+ 	@CLANG@ ${CLANG_FLAGS} ${CLFLAGS} ${DEVICE_CL_FLAGS} -D__CBUILD__ -c -o $@ -include ${abs_top_srcdir}/include/_kernel_c.h $<
+ %.cc.bc: %.cc  ${LKERNEL_HDRS_EXTRA}
+ 	mkdir -p ${dir $@}
+-	@CLANGXX@ ${CLANG_FLAGS} ${CLANGXX_FLAGS} ${DEVICE_CL_FLAGS} -c -o $@ $<
++	@CLANGXX@ -std=c++11 ${CLANG_FLAGS} ${CLANGXX_FLAGS} ${DEVICE_CL_FLAGS} -c -o $@ $<
+ %.cl.bc: %.cl ${abs_top_srcdir}/include/_kernel.h ${abs_top_srcdir}/include/_kernel_c.h ${abs_top_srcdir}/include/pocl_types.h ${LKERNEL_HDRS_EXTRA}
+ 	mkdir -p ${dir $@}
+ 	@CLANG@ ${CLANG_FLAGS} -x cl ${CLFLAGS} ${DEVICE_CL_FLAGS} -fsigned-char -c -o $@ $< -include ${abs_top_srcdir}/include/_kernel.h
diff --git a/pocl.changes b/pocl.changes
index ea7a601..2740dc3 100644
--- a/pocl.changes
+++ b/pocl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  4 15:04:04 UTC 2016 - mardnh@gmx.de
+
+- Add patch: 0001-Fixes-357-broken-build-with-GCC-6.1.patch
+  * Fix build with GCC 6.x
+
 -------------------------------------------------------------------
 Tue Apr  5 07:18:43 UTC 2016 - mpluskal@suse.com
 
diff --git a/pocl.spec b/pocl.spec
index a1ea456..384dbe5 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -29,6 +29,7 @@ Release:        0
 Url:            http://portablecl.org/
 Source0:        http://portablecl.org/downloads/%{name}-%{version}.tar.gz
 Source99:       pocl-rpmlintrc
+Patch0:         0001-Fixes-357-broken-build-with-GCC-6.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Only armv7l is supported
 # PPC support is currently broken, due to path problems
@@ -87,6 +88,7 @@ This Subpackage provides the development files needed for pocl.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir build

From 89c9b90d01a144f3e5a9012cac72a95a79b8a70a9f3ab44563f54514fe4224b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Mon, 4 Jul 2016 19:16:15 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/science/pocl?expand=0&rev=10

---
 pocl.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pocl.spec b/pocl.spec
index 384dbe5..741f5a4 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -39,10 +39,10 @@ BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  libtool
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  llvm >= 3.3
-BuildRequires:  llvm-clang >= 3.3
-BuildRequires:  llvm-clang-devel >= 3.3
-BuildRequires:  llvm-devel >= 3.3
+BuildRequires:  llvm > 3.5
+BuildRequires:  llvm-clang > 3.5
+BuildRequires:  llvm-clang-devel > 3.5
+BuildRequires:  llvm-devel > 3.5
 BuildRequires:  ncurses-devel
 BuildRequires:  opencl-headers
 BuildRequires:  pkgconfig
@@ -51,7 +51,7 @@ BuildRequires:  pkgconfig(OpenCL)
 BuildRequires:  pkgconfig(hwloc)
 #BuildRequires:	vecmath-devel
 Requires:       libstdc++-devel
-Requires:       llvm-clang >= 3.3
+Requires:       llvm-clang > 3.5
 Requires:       uthash
 
 %description