[beignet] 09/09: Work around Ubuntu cmake not finding Python (LP#1515419)

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Thu Nov 12 22:23:27 UTC 2015


This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit bc705d881680e9fe25aea21e97786f11e75678ac
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Thu Nov 12 22:07:24 2015 +0000

    Work around Ubuntu cmake not finding Python (LP#1515419)
---
 debian/changelog                   |  5 +++--
 debian/patches/find-python35.patch | 21 +++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 576c906..26b8b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-beignet (1.1.1-2) UNRELEASED; urgency=medium
+beignet (1.1.1-2) unstable; urgency=medium
 
   * Add patches to support LLVM 3.6/3.7,
     use system default version. (Closes: #803643)
@@ -8,8 +8,9 @@ beignet (1.1.1-2) UNRELEASED; urgency=medium
   * Better document that linux >= 4.2 fixes the
     "no __local on Haswell" bug.
   * Fix FTBFS on kfreebsd-*.
+  * Work around Ubuntu cmake not finding Python (LP#1515419).
 
- -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Mon, 09 Nov 2015 21:47:04 +0000
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Thu, 12 Nov 2015 21:27:16 +0000
 
 beignet (1.1.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/find-python35.patch b/debian/patches/find-python35.patch
new file mode 100644
index 0000000..3e21fab
--- /dev/null
+++ b/debian/patches/find-python35.patch
@@ -0,0 +1,21 @@
+Description: Find Python 3.5
+
+Workaround for
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802826
+https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/1515419
+
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2ed8429..caa27c2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,6 +210,7 @@ ELSE(OCLIcd_FOUND)
+   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
+ ENDIF(OCLIcd_FOUND)
+ 
++set(Python_ADDITIONAL_VERSIONS 3.5)
+ Find_Package(PythonInterp)
+ 
+ OPTION(BUILD_EXAMPLES "Build examples" OFF)
+
diff --git a/debian/patches/series b/debian/patches/series
index 4f067fd..02a34a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ llvm-37-support.patch
 printf-fix-90472.patch
 printf-fix2.patch
 fix-userptr-warning.patch
+find-python35.patch

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