* New snapshot release

* Bring back polly and remove libcloog-isl-dev & libisl-dev as build deps
  (shipped in the polly source tree)
* Set the correct conflicts (Closes: #777580, #777581, #777582)
This commit is contained in:
Sylvestre Ledru 2015-02-10 11:10:46 +00:00
parent e098badb16
commit bc52a6d240
3 changed files with 15 additions and 15 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
llvm-toolchain-snapshot (1:3.7~svn228604-1) unstable; urgency=medium
* New snapshot release
* Bring back polly and remove libcloog-isl-dev & libisl-dev as build deps
(shipped in the polly source tree)
* Set the correct conflicts (Closes: #777580, #777581, #777582)
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 09 Feb 2015 22:05:04 +0100
llvm-toolchain-snapshot (1:3.7~svn227076-1) unstable; urgency=medium
* New snapshot release

10
debian/control vendored
View File

@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
autoconf, automake, perl, libtool, chrpath, texinfo,
sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev,
libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev,
libisl-dev (>= 0.11.1), libjsoncpp-dev,
libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev,
libjsoncpp-dev,
lcov, procps, help2man, dh-ocaml, zlib1g-dev
Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
libllvm-3.7-ocaml-dev
@ -171,8 +171,8 @@ Package: python-clang-3.7
Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
Replaces: python-clang-3.3, python-clang-3.4
Breaks: python-clang-3.3, python-clang-3.4
Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6
Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6
Description: Clang Python Bindings
Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@ -416,7 +416,7 @@ Package: python-lldb-3.7
Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
Conflicts: python-lldb-3.4, python-lldb-3.5
Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger, python lib
LLDB is a next generation, high-performance debugger. It is built as a set of

11
debian/rules vendored
View File

@ -69,13 +69,7 @@ endif
endif
# Enable polly (or not)
POLLY_ENABLE=no
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libisl-dev) ge 0.12.1; echo $$?),0)
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libcloog-isl-dev) ge 0.18.1; echo $$?),0)
# polly upstream is now using the isl trunk. disabling it for now
POLLY_ENABLE=no
endif
endif
POLLY_ENABLE=yes
ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
# enable the code coverage
@ -264,9 +258,6 @@ override_dh_auto_install:
chrpath -d $(TARGET_BUILD)/Release/bin/clang
chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable`
if build-llvm/tools/polly/Release/lib/libpolly*a; then \
chmod -x $(TARGET_BUILD)/tools/polly/Release/lib/libpolly*.a; \
fi
# Add the trailing soname
mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)