merge changes from the 3.3 release

This commit is contained in:
Sylvestre Ledru 2013-06-13 16:42:42 +00:00
parent 8fee87f85d
commit d0f49fcedc
4 changed files with 14 additions and 8 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-snapshot (1:3.4~svn183554-1~exp1) experimental; urgency=low
* New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 11 Jun 2013 14:42:37 +0200
llvm-toolchain-snapshot (1:3.4~svn182733-1~exp1) experimental; urgency=low
* New snapshot release (3.4 release)

7
debian/control vendored
View File

@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect,
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), binutils-gold [amd64 armel armhf i386 powerpc powerpcspe ppc64 sparc sparc64 x32],
libisl-dev (>= 0.11.1), binutils-gold (>= 2.23.52.20130522)
[amd64 armel armhf i386 powerpc powerpcspe ppc64 sparc sparc64 x32],
lcov, procps
Build-Conflicts: oprofile, ocaml
Standards-Version: 3.9.4
@ -23,8 +24,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
libclang1-3.4 (= ${binary:Version})
Provides: c-compiler, objc-compiler, c++-compiler
Recommends: llvm-3.4-dev, python
Replaces: clang (<< 1:3.4), clang-3.1, clang-3.2, compiler-rt
Breaks: clang (<< 1:3.4), clang-3.1, clang-3.2, compiler-rt
Replaces: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt
Breaks: clang (<< 1:3.4), clang-3.1, clang-3.2, clang-3.3, compiler-rt
Description: C, C++ and Objective-C compiler (LLVM based)
Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Some of its goals include the following:

View File

@ -22,4 +22,3 @@ declare_clear_cache.diff
ia64-fix.diff
clang-format-version.diff
kfreebsd.diff

8
debian/rules vendored
View File

@ -232,10 +232,10 @@ override_dh_auto_test:
# lldb tests
cd $(TARGET_BUILD)/Release/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi
cd $(TARGET_BUILD)/Release/lib/python2.7/site-packages/lldb && if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then ln -s ../../../libLLVM-$(LLVM_VERSION).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); fi
cd $(TARGET_BUILD)/ && $(MAKE) -C tools/lldb/test || true
if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \
cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \
fi
# cd $(TARGET_BUILD)/ && $(MAKE) -C tools/lldb/test || true
# if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \
# cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \
# fi
# Managed by debian build system
rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so