* Disable the lldb build for AArch64.

* Don't run the lldb tests on armhf (time out on the buildd).
* Rebuild for ocaml-4.01.
* Bring over Ubuntu changes from 3.3:
  - Revert to using the static copy of libjsoncpp, since the shared
    library lacks sane versioning, and this is only a few thousand
    lines of cargo-culted code from a reasonably stagnant upstream.
  - Drop lcov build-dep to avoid pulling it into main, due to its
    being fundamentally incompatibe with our newer GCC versions.
* Don't run the lldb tests on armhf (time out on the buildd).
* Disable the lldb build for AArch64.
* Build-depend on gcc-multilib on amd64 and i386.
This commit is contained in:
Sylvestre Ledru 2014-02-12 18:05:08 +00:00
parent c3eb489b0f
commit 77db376e7c
3 changed files with 39 additions and 3 deletions

34
debian/changelog vendored
View File

@ -5,6 +5,10 @@ llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium
* Bring back the dependency on gcc 4.8. It breaks the nightly snapshot
packages and it should be the norm now...
[ Matthias Klose ]
* Disable the lldb build for AArch64.
* Don't run the lldb tests on armhf (time out on the buildd).
[ Martin Nowack ]
* Fixed build directory for llvm-config
* Add Unittests for running tests for llvm-based projects
@ -19,6 +23,36 @@ llvm-toolchain-3.4 (1:3.4-1) unstable; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 20 Dec 2013 18:36:58 +0100
llvm-toolchain-3.4 (1:3.4~+rc3-1ubuntu4) trusty; urgency=medium
* Rebuild for ocaml-4.01.
-- Matthias Klose <doko@ubuntu.com> Mon, 23 Dec 2013 12:11:17 +0000
llvm-toolchain-3.4 (1:3.4~+rc3-1ubuntu3) trusty; urgency=low
* Bring over Ubuntu changes from 3.3:
- Revert to using the static copy of libjsoncpp, since the shared
library lacks sane versioning, and this is only a few thousand
lines of cargo-culted code from a reasonably stagnant upstream.
- Drop lcov build-dep to avoid pulling it into main, due to its
being fundamentally incompatibe with our newer GCC versions.
-- Matthias Klose <doko@ubuntu.com> Fri, 20 Dec 2013 12:59:01 +0100
llvm-toolchain-3.4 (1:3.4~+rc3-1ubuntu2) trusty; urgency=low
* Don't run the lldb tests on armhf (time out on the buildd).
-- Matthias Klose <doko@ubuntu.com> Wed, 18 Dec 2013 12:29:56 +0100
llvm-toolchain-3.4 (1:3.4~+rc3-1ubuntu1) trusty; urgency=low
* Disable the lldb build for AArch64.
* Build-depend on gcc-multilib on amd64 and i386.
-- Matthias Klose <doko@ubuntu.com> Tue, 17 Dec 2013 18:44:50 +0100
llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low
* New testing upstream release

4
debian/control vendored
View File

@ -362,7 +362,7 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lldb -------------
Package: lldb-3.4
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc
# ia64 mips mipsel hurd have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev
Pre-Depends: ${misc:Pre-Depends}
@ -374,7 +374,7 @@ Description: Next generation, high-performance debugger
Project, such as the Clang expression parser and LLVM disassembler.
Package: lldb-3.4-dev
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc
# ia64 mips mipsel hurd have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.4 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}

4
debian/rules vendored
View File

@ -104,7 +104,7 @@ endif
LLDB_ENABLE=yes
LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel ia64
LLDB_DISABLE_ARCHS := arm64 hurd-i386 mips mipsel ia64
# hurd has threading issues
# mips* fails with "undefined references to `__atomic_load_8'"
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
@ -344,6 +344,7 @@ endif
rm -f $(TARGET_BUILD)/Release/lib/libclang.so.1
# lldb tests
ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf))
if test $(LLDB_ENABLE) = yes; then \
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; \
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; \
@ -352,6 +353,7 @@ endif
if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \
cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \
fi
endif
# Managed by debian build system
rm -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/python*/site-packages/lldb/_lldb.so