[beignet] 01/01: refresh patches
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Jan 23 22:32:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository beignet.
commit e5c499491079cc09c64313b8ae9400ad1915fbfb
Author: Andreas Beckmann <anbe at debian.org>
Date: Fri Jan 23 23:32:37 2015 +0100
refresh patches
---
debian/changelog | 1 +
.../Debian-compliant-compiler-flags-handling.patch | 14 +++++++-------
debian/patches/Enable-test-debug.patch | 17 ++++-------------
debian/patches/Link-against-terminfo.patch | 18 +++++++-----------
4 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 99d28de..19d0d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ beignet (1.0.1-1) UNRELEASED; urgency=medium
* New upstream release.
* Add beignet-dbg package with debug symbols.
* Update watch file.
+ * Refresh patches.
-- Andreas Beckmann <anbe at debian.org> Fri, 23 Jan 2015 23:17:24 +0100
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index c083885..f5a729e 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -3,7 +3,7 @@ Description: Respect CFLAGS,etc and be verbose
Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+@@ -37,7 +37,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
INCLUDE (FindPkgConfig)
@@ -11,20 +11,20 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
if (NOT LIB_INSTALL_DIR)
set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-@@ -81,8 +80,8 @@ elseif (COMPILER STREQUAL "CLANG")
+@@ -66,8 +65,8 @@ elseif (COMPILER STREQUAL "CLANG")
elseif (COMPILER STREQUAL "ICC")
set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E")
endif ()
--set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof -fno-rtti")
+-set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof")
-set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof -fno-rtti")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof")
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")
set (CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DGBE_DEBUG=1")
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0")
-@@ -96,7 +95,7 @@ set (CMAKE_C_FLAGS_RELEASE "-O2 -
- #INCLUDE(CMake/FindLLVM.cmake)
- Find_Package(LLVM 3.3)
+@@ -88,7 +87,7 @@ ELSE (USE_STANDALONE_GBE_COMPILER STREQU
+ ENDIF (USE_STANDALONE_GBE_COMPILER STREQUAL "true")
+
-set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LDFLAGS}")
+set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined ${LLVM_LDFLAGS}")
diff --git a/debian/patches/Enable-test-debug.patch b/debian/patches/Enable-test-debug.patch
index 9eba999..4fc96ae 100644
--- a/debian/patches/Enable-test-debug.patch
+++ b/debian/patches/Enable-test-debug.patch
@@ -177,15 +177,6 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
float gpu_data[max_function * count_input] = {0}, cpu_data[max_function * count_input] = {0};
for(i=0; i<count_input_ori;i++)
-@@ -75,7 +75,7 @@
- #if udebug
- if ( (isinf(cpu_data[index_cur]) && !isinf(gpu_data[index_cur])) ||
- (isnan(cpu_data[index_cur]) && !isnan(gpu_data[index_cur])) ||
-- (fabs(gpu_data[index_cur] - cpu_data[index_cur]) > cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR.) )
-+ (fabs(gpu_data[index_cur] - cpu_data[index_cur]) > cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR) )
- {
- printf_c("%d/%d: x:%f, y:%f -> gpu:%f cpu:%f\n", k, i, input_data1[k], input_data2[k], gpu_data[index_cur], cpu_data[index_cur]);
- }
@@ -93,6 +94,7 @@ static void builtin_pow(void)
#endif
}
@@ -205,15 +196,15 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+obj-`dpkg-architecture -qDEB_HOST_MULTIARCH`/utests/utest_run -a
--- a/utests/utest_generator.py
+++ b/utests/utest_generator.py
-@@ -73,6 +73,7 @@ def udebug(ulpSize,returnType):
+@@ -161,6 +161,7 @@ def udebug(ulpSize,returnType,function):
}
#endif
}
+ OCL_ASSERTM(status == 0, log);
- }\n'''%(returnType,\
+ }\n'''%(returnType,Min_ulp(function),\
ulpUnit(ulpSize),ulpNum(ulpSize),\
ulpNum(ulpSize), ulpNum(ulpSize),\
-@@ -139,16 +140,16 @@ which can print more values and informat
+@@ -227,16 +228,16 @@ which can print more values and informat
#include <algorithm>
#include <string.h>
@@ -233,7 +224,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
}
'''
#########Execute class itself
-@@ -248,6 +249,7 @@ which can print more values and informat
+@@ -336,6 +337,7 @@ which can print more values and informat
static void %s_%s(void)
{
int index;
diff --git a/debian/patches/Link-against-terminfo.patch b/debian/patches/Link-against-terminfo.patch
index 8d7ac57..74c7cc8 100644
--- a/debian/patches/Link-against-terminfo.patch
+++ b/debian/patches/Link-against-terminfo.patch
@@ -6,17 +6,13 @@ Subject: Link against terminfo
backend/src/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt
-index a3818ab5961a..b5c5c01d81f8 100644
--- a/backend/src/CMakeLists.txt
+++ b/backend/src/CMakeLists.txt
-@@ -195,7 +195,8 @@ target_link_libraries(
- ${LLVM_MODULE_LIBS}
- ${LLVM_SYSTEM_LIBS}
- ${CMAKE_THREAD_LIBS_INIT}
-- ${CMAKE_DL_LIBS})
-+ ${CMAKE_DL_LIBS}
-+ tinfo)
-
- add_library(gbeinterp SHARED gbe_bin_interpreter.cpp)
+@@ -128,6 +128,7 @@ set (GBE_LINK_LIBRARIES
+ ${LLVM_SYSTEM_LIBS}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${CMAKE_DL_LIBS}
++ tinfo
+ )
+ include_directories (.)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-commits
mailing list