rpm/pocl
SHA256
1
0
Fork 0
forked from pool/pocl
Code Pull Requests Activity

Accepting request 406457 from home:mnhauke:branches:science

Browse Source 
- 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
This commit is contained in:
Matthias Mailänder 2016-07-04 19:15:29 +00:00 committed by Git OBS Bridge
parent 9e05584cff
commit b8c69dda68
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Fixes-357-broken-build-with-GCC-6.1.patch Normal file
View File

@ -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

6
pocl.changes
View File

@ -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

2
pocl.spec
View File

@ -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