[libclc] 112/291: Imported Debian patch 0~git20140101-1
Andreas Beckmann
anbe at moszumanska.debian.org
Tue Sep 8 10:53:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository libclc.
commit 51247bb10b461eafb4bec7060a29721b13f2d522
Author: Michael Gilbert <mgilbert at debian.org>
Date: Fri Jan 10 02:46:15 2014 +0000
Imported Debian patch 0~git20140101-1
---
debian/changelog | 14 ++++++++++++++
debian/control | 9 +++++----
debian/copyright | 5 +++--
debian/libclc-dev.install | 2 +-
.../0001-Set-appropriate-path-to-clang.patch | 22 ++++++++++++++++++++++
debian/patches/clangpath.patch | 15 ---------------
debian/patches/series | 2 +-
debian/rules | 19 +++++++++++++++----
8 files changed, 61 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 65a20dc..09b560a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libclc (0~git20140101-1) unstable; urgency=medium
+
+ [ Julian Wollrath ]
+ * New upstream snapshot.
+ * Use LLVM 3.4 and correct dependencies.
+ * Enable verbose build.
+ * Bump standards version to 3.9.5 (no changes needed).
+ * Update years in debian/copyright.
+
+ [ Michael Gilbert ]
+ * Eliminate duplicated files.
+
+ -- Michael Gilbert <mgilbert at debian.org> Fri, 10 Jan 2014 02:46:15 +0000
+
libclc (0~git20130819-2) unstable; urgency=low
* Add libclc-dev dependency to libclc-r600 and libclc-ptx.
diff --git a/debian/control b/debian/control
index 1b89caa..8318e37 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Uploaders:
Julian Wollrath <jwollrath at web.de>,
Build-Depends:
debhelper (>= 9),
- llvm-3.3-dev,
- clang-3.3,
+ llvm-3.4-dev,
+ clang-3.4,
python,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://libclc.llvm.org
Package: libclc-ptx
@@ -18,6 +18,7 @@ Architecture: all
Depends:
${misc:Depends},
libclc-dev (= ${binary:Version}),
+ libclang-common-3.4-dev,
Description: OpenCL C language implementation - ptx support
libclc is an open implementation of the OpenCL C programming language,
as specified by the OpenCL 1.1 Specification.
@@ -29,6 +30,7 @@ Architecture: all
Depends:
${misc:Depends},
libclc-dev (= ${binary:Version}),
+ libclang-common-3.4-dev,
Description: OpenCL C language implementation - r600 support
libclc is an open implementation of the OpenCL C programming language,
as specified by the OpenCL 1.1 Specification.
@@ -40,7 +42,6 @@ Section: libdevel
Architecture: all
Depends:
${misc:Depends},
- libclang-common-3.3-dev,
Description: OpenCL C language implementation - development files
libclc is an open implementation of the OpenCL C programming language,
as specified by the OpenCL 1.1 Specification.
diff --git a/debian/copyright b/debian/copyright
index 271fe10..ecc1f23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,12 @@ Upstream-Name: libclc
Source: http://libclc.llvm.org
Files: *
-Copyright: 2011-2013 Peter Collingbourne <peter at pcc.me.uk>
+Copyright: 2011-2014 Peter Collingbourne <peter at pcc.me.uk>
License: BSD or MIT
Files: debian/*
-Copyright: 2013 Julian Wollrath <jwollrath at web.de>, Michael Gilbert <mgilbert at debian.org>
+Copyright: 2013-2014 Michael Gilbert <mgilbert at debian.org>
+ 2013-2014 Julian Wollrath <jwollrath at web.de>
License: BSD or MIT
License: BSD
diff --git a/debian/libclc-dev.install b/debian/libclc-dev.install
index f49c875..59c3616 100644
--- a/debian/libclc-dev.install
+++ b/debian/libclc-dev.install
@@ -1,2 +1,2 @@
usr/include
-usr/lib/pkgconfig
+usr/share/pkgconfig
diff --git a/debian/patches/0001-Set-appropriate-path-to-clang.patch b/debian/patches/0001-Set-appropriate-path-to-clang.patch
new file mode 100644
index 0000000..e5d465a
--- /dev/null
+++ b/debian/patches/0001-Set-appropriate-path-to-clang.patch
@@ -0,0 +1,22 @@
+Description: Set appropriate path to clang
+Author: Julian Wollrath <jwollrath at web.de>
+Date: Tue, 7 Jan 2014 16:32:47 +0100
+
+--- a/configure.py
++++ b/configure.py
+@@ -73,13 +73,13 @@ llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' '
+ llvm_config(['--ldflags'])
+ llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
+
+-llvm_clang = os.path.join(llvm_bindir, 'clang')
++llvm_clang = 'clang'
+ llvm_link = os.path.join(llvm_bindir, 'llvm-link')
+ llvm_opt = os.path.join(llvm_bindir, 'opt')
+
+ cxx_compiler = options.with_cxx_compiler
+ if not cxx_compiler:
+- cxx_compiler = os.path.join(llvm_bindir, 'clang++')
++ cxx_compiler = 'clang++'
+
+ available_targets = {
+ 'r600--' : { 'devices' :
diff --git a/debian/patches/clangpath.patch b/debian/patches/clangpath.patch
deleted file mode 100644
index bfe6bdb..0000000
--- a/debian/patches/clangpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-description: set appropriate path to clang
-author: Michael Gilbert <mgilbert at debian.org>
---- libclc.orig/configure.py 2013-09-02 17:29:12.448415742 +0000
-+++ libclc/configure.py 2013-09-02 19:09:55.188570466 +0000
-@@ -65,8 +65,8 @@
- llvm_config(['--ldflags'])
- llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
-
--llvm_clang_cxx = os.path.join(llvm_bindir, 'clang++')
--llvm_clang = os.path.join(llvm_bindir, 'clang')
-+llvm_clang_cxx = 'clang++'
-+llvm_clang = 'clang'
- llvm_link = os.path.join(llvm_bindir, 'llvm-link')
- llvm_opt = os.path.join(llvm_bindir, 'opt')
-
diff --git a/debian/patches/series b/debian/patches/series
index f850983..f03806c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-clangpath.patch
+0001-Set-appropriate-path-to-clang.patch
diff --git a/debian/rules b/debian/rules
index 8d0897f..9c0bef7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
export DH_VERBOSE=1
+export VERBOSE=1
confflags=--prefix=/usr \
- --with-llvm-config=/usr/bin/llvm-config-3.3 \
+ --with-llvm-config=/usr/bin/llvm-config-3.4 \
+
+path=debian/tmp/usr/lib/clc
%:
dh $@ --parallel
@@ -11,9 +14,17 @@ confflags=--prefix=/usr \
override_dh_auto_configure:
./configure.py $(confflags)
-override_dh_auto_clean:
- dh_auto_clean
+override_dh_install:
+ test $(shell sha512sum $(path)/cypress-r600--.bc) != $(shell sha512sum $(path)/cayman-r600--.bc) || \
+ rm -f $(path)/cypress-r600--.bc && \
+ ln -s cayman-r600--.bc $(path)/cypress-r600--.bc
+ test $(shell sha512sum $(path)/cedar-r600--.bc) != $(shell sha512sum $(path)/barts-r600--.bc) || \
+ rm -f $(path)/cedar-r600--.bc && \
+ ln -s barts-r600--.bc $(path)/cedar-r600--.bc
+ dh_install
+
+override_dh_clean:
test ! -e Makefile || make clean
- rm -f Makefile libclc.pc
find -name '*.pyc' -execdir rm -f {} \;
find -name '*.d' -execdir rm -f {} \;
+ dh_clean -- Makefile libclc.pc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git
More information about the Pkg-opencl-commits
mailing list