[beignet/f20] Update LLVM/Terminfo patch from upstream maillist

Igor Gnatenko ignatenkobrain at fedoraproject.org
Thu Feb 13 07:42:36 UTC 2014


commit 7fd9d7119d834970914db93e7db386ff8eb9efb2
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Thu Feb 13 11:25:13 2014 +0400

    Update LLVM/Terminfo patch from upstream maillist
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

 0001-cmake-Fix-linking-with-LLVM-Terminfo.patch |   31 ++++++++++++----------
 beignet.spec                                    |    7 ++++-
 2 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/0001-cmake-Fix-linking-with-LLVM-Terminfo.patch b/0001-cmake-Fix-linking-with-LLVM-Terminfo.patch
index fbfdfd0..5ed4be3 100644
--- a/0001-cmake-Fix-linking-with-LLVM-Terminfo.patch
+++ b/0001-cmake-Fix-linking-with-LLVM-Terminfo.patch
@@ -1,7 +1,7 @@
-From 77c83bbf604b80e4be8f191677da056cd8fdcf7d Mon Sep 17 00:00:00 2001
+From cdb456901240739df8628c99614564f58ccacac8 Mon Sep 17 00:00:00 2001
 From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
-Date: Thu, 13 Feb 2014 07:50:12 +0400
-Subject: [PATCH] cmake: Fix linking with LLVM/Terminfo
+Date: Thu, 13 Feb 2014 10:46:03 +0400
+Subject: [PATCH v2] cmake: Fix linking with LLVM/Terminfo
 
 DEBUG: [  9%] Building CXX object backend/src/CMakeFiles/gbe_bin_generater.dir/gbe_bin_generater.cpp.o
 DEBUG: Linking CXX executable gbe_bin_generater
@@ -16,21 +16,24 @@ DEBUG: (.text+0x738): undefined reference to `del_curterm'
 
 Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
 ---
- backend/src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
+ backend/src/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt
-index 33494a0..86ab107 100644
+index 33494a0..6db4a2a 100644
 --- a/backend/src/CMakeLists.txt
 +++ b/backend/src/CMakeLists.txt
-@@ -179,6 +179,7 @@ ll_add_library (${pcm_lib} pcm_sources)
- ADD_DEPENDENCIES (gbe pch_object ${pcm_lib})
- target_link_libraries(
-                       gbe
-+                      tinfo
-                       ${DRM_INTEL_LIBRARY}
-                       ${DRM_LIBRARY}
-                       ${OPENGL_LIBRARIES}
+@@ -188,6 +188,10 @@ target_link_libraries(
+                       ${CMAKE_THREAD_LIBS_INIT}
+                       ${CMAKE_DL_LIBS})
+ 
++if (LLVM_VERSION_NODOT VERSION_EQUAL 34)
++  target_link_libraries(gbe tinfo)
++endif(LLVM_VERSION_NODOT VERSION_EQUAL 34)
++
+ link_directories (${LLVM_LIBRARY_DIR})
+ ADD_EXECUTABLE(gbe_bin_generater gbe_bin_generater.cpp)
+ TARGET_LINK_LIBRARIES(gbe_bin_generater gbe)
 -- 
 1.8.5.3
 
diff --git a/beignet.spec b/beignet.spec
index 9b172e8..bb26833 100644
--- a/beignet.spec
+++ b/beignet.spec
@@ -1,11 +1,13 @@
 Name:           beignet
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source implementation of the OpenCL for Intel GPUs
 
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/Beignet/
 Source0:        http://cgit.freedesktop.org/beignet/snapshot/Release_v%{version}.tar.gz
+# http://lists.freedesktop.org/archives/beignet/2014-February/002504.html
+# http://lists.freedesktop.org/archives/beignet/2014-February/002506.html
 Patch0:         0001-cmake-Fix-linking-with-LLVM-Terminfo.patch
 
 BuildRequires:  cmake
@@ -61,6 +63,9 @@ find %{buildroot}%{_includedir}/CL/ -regextype posix-egrep -not -regex ".*(cl_in
 %{_includedir}/CL/cl_intel.h
 
 %changelog
+* Thu Feb 13 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.8-2
+- Update LLVM/Terminfo patch from upstream maillist
+
 * Wed Feb 12 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.8-1
 - 0.8 upstream release
 


More information about the scm-commits mailing list