* Disable the build of lldb on mips64el, ppc64 and s390x for real

* Add symlink from ./build to ../share and ../lib etc
  Thanks to Ximin Luo for the patch (Closes: #834144)
This commit is contained in:
Sylvestre Ledru 2016-08-12 16:33:13 +00:00
parent fdd4d6841d
commit efb93840cf
4 changed files with 14 additions and 9 deletions

3
debian/changelog vendored
View File

@ -1,5 +1,8 @@
llvm-toolchain-snapshot (1:4.0~svn275971-1~exp1) experimental; urgency=medium llvm-toolchain-snapshot (1:4.0~svn275971-1~exp1) experimental; urgency=medium
* Disable the build of lldb on mips64el, ppc64 and s390x for real
* Add symlink from ./build to ../share and ../lib etc
Thanks to Ximin Luo for the patch (Closes: #834144)
* Sync the 3.9 changes into 4.0 * Sync the 3.9 changes into 4.0
* Fix the cmake paths in llvm-4.0-dev deb package. Thanks to Brad King * Fix the cmake paths in llvm-4.0-dev deb package. Thanks to Brad King
for the patch (Closes: #819072) for the patch (Closes: #819072)

16
debian/control vendored
View File

@ -446,8 +446,8 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lldb ------------- # ------------- lldb -------------
Package: lldb-4.0 Package: lldb-4.0
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el sparc64 have been removed # ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}), llvm-4.0-dev Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}), llvm-4.0-dev
Suggests: python-lldb-4.0 Suggests: python-lldb-4.0
Conflicts: lldb-3.4, lldb-3.5 Conflicts: lldb-3.4, lldb-3.5
@ -458,8 +458,8 @@ Description: Next generation, high-performance debugger
Project, such as the Clang expression parser and LLVM disassembler. Project, such as the Clang expression parser and LLVM disassembler.
Package: liblldb-4.0 Package: liblldb-4.0
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el sparc64 have been removed # ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Section: libs Section: libs
@ -473,8 +473,8 @@ Description: Next generation, high-performance debugger, library
This package contains the LLDB runtime library. This package contains the LLDB runtime library.
Package: liblldb-4.0-dbg Package: liblldb-4.0-dbg
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe sh4 x32 mips mipsel
# ia64 mips mipsel hurd ppc64el alpha s390x sparc64 powerpc have been removed # ia64 mips mipsel hurd ppc64el alpha s390x sparc64 powerpc ppc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-4.0 (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-4.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Section: debug Section: debug
@ -503,8 +503,8 @@ Description: Next generation, high-performance debugger, python lib
Package: liblldb-4.0-dev Package: liblldb-4.0-dev
Section: libdevel Section: libdevel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el sparc64 have been removed # ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-4.0 (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-4.0 (= ${binary:Version})
Replaces: lldb-4.0-dev (<= 1:4.0~svn215195-2) Replaces: lldb-4.0-dev (<= 1:4.0~svn215195-2)
Breaks: lldb-4.0-dev (<< 1:4.0~svn215195-2) Breaks: lldb-4.0-dev (<< 1:4.0~svn215195-2)

View File

@ -10,6 +10,8 @@ usr/include/llvm-c-@LLVM_VERSION@/llvm-c usr/lib/llvm-@LLVM_VERSION@/build/inclu
usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/build/include/llvm usr/include/llvm-@LLVM_VERSION@/llvm usr/lib/llvm-@LLVM_VERSION@/build/include/llvm
usr/lib/llvm-@LLVM_VERSION@/include/ usr/lib/llvm-@LLVM_VERSION@/build/include usr/lib/llvm-@LLVM_VERSION@/include/ usr/lib/llvm-@LLVM_VERSION@/build/include
usr/lib/llvm-@LLVM_VERSION@/lib/ usr/lib/llvm-@LLVM_VERSION@/build/lib
usr/lib/llvm-@LLVM_VERSION@/share/ usr/lib/llvm-@LLVM_VERSION@/build/share
usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Release usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Release
usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts

2
debian/rules vendored
View File

@ -120,7 +120,7 @@ endif
LLDB_ENABLE=yes LLDB_ENABLE=yes
LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x sparc64 LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x sparc64 mips64el ppc64
# hurd has threading issues # hurd has threading issues
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
# Disable LLDB for this arch. # Disable LLDB for this arch.