[beignet] 01/01: Use dpkg-query not apt-cache
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Sat Apr 30 22:09:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
rnpalmer-guest pushed a commit to branch master
in repository beignet.
commit 901d4b82b203f516852b7bfdceb5541108a800a7
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Sat Apr 30 23:05:15 2016 +0100
Use dpkg-query not apt-cache
---
debian/changelog | 2 +-
debian/control | 1 +
debian/rules | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 384fc8d..175a55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ beignet (1.1.2-1) unstable; urgency=medium
* Use std::isnan/isinf to fix Ubuntu FTBFS.
* Add LLVM 3.8 support.
- -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Sat, 30 Apr 2016 21:13:09 +0100
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Sat, 30 Apr 2016 23:04:19 +0100
beignet (1.1.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 7ac7b7a..b4c750a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
# We use the same LLVM version as mesa (currently 3.7 in Debian,
# 3.8 in Ubuntu); to avoid needing separate packages, build-depend
# on both and choose in debian/rules
+ libgl1-mesa-dri,
clang-3.7,
libclang-3.7-dev,
llvm-3.7-dev,
diff --git a/debian/rules b/debian/rules
index ce0b3ee..e0005e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ SUPERFLUOUS=cl.h cl_d3d10.h cl_dx9_media_sharing.h cl_ext.h cl_gl_ext.h cl_platf
# Use the same LLVM version as mesa (build will fail if this version is not available; this is intentional, as mixing versions may cause crashes)
# http://lists.alioth.debian.org/pipermail/pkg-opencl-devel/Week-of-Mon-20160418/000963.html
-LLVM_VERSION:=$(shell apt-cache depends libgl1-mesa-dri | grep -o -e "Depends: libllvm[0-9.]*" | grep -o -e "[0-9.]*")
+LLVM_VERSION:=$(shell dpkg-query -f '$${Depends} \n' -W libgl1-mesa-dri:${DEB_HOST_ARCH} | grep -o -e "libllvm[0-9.]*" | grep -o -e "[0-9.]*")
ifeq (${LLVM_VERSION},)# mesa not using LLVM at all on this architecture
LLVM_VERSION:=3.7
endif
--
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