diff options
author | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-16 20:40:57 +0000 |
---|---|---|
committer | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-16 20:40:57 +0000 |
commit | 94c6769811542c30c27c05f59b904fff5c280600 (patch) | |
tree | 16d52000e14ef6cfa7a9f0ca0919076e12c0b08d | |
parent | f1ba7128a8fe96b0fb3498322d00300ae6656670 (diff) | |
download | llvm-toolchain-3.5-94c6769811542c30c27c05f59b904fff5c280600.tar.gz |
Just like in 3.4, bring back lldb & lldb-dev under mips & mipsel
git-svn-id: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5@1345 670adf90-79fe-46c2-b027-9eb1e76e7c7d
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rwxr-xr-x | debian/rules | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 951ee00..7844e9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-3.5 (1:3.5~+rc2-2) UNRELEASED; urgency=medium * Cherry-pick to commit from upstream (revisions 214906 214907) to improve the gcc compat * Remove scan-build-clang-path.diff (applied upstream) + * Just like in 3.4, bring back lldb & lldb-dev under mips & mipsel -- Sylvestre Ledru <sylvestre@debian.org> Sat, 09 Aug 2014 22:36:06 +0200 diff --git a/debian/control b/debian/control index 1ddab9a..b75f49b 100644 --- a/debian/control +++ b/debian/control @@ -378,7 +378,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.5 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha 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 mips mipsel # ia64 mips mipsel hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.5 (= ${binary:Version}), python, llvm-3.5-dev Pre-Depends: ${misc:Pre-Depends} @@ -390,7 +390,7 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: lldb-3.5-dev -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha 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 mips mipsel # ia64 mips mipsel hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.5 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/rules b/debian/rules index 5fadc1a..d7ccd14 100755 --- a/debian/rules +++ b/debian/rules @@ -116,7 +116,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := arm64 hurd-i386 mips mipsel ia64 ppc64el +LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) @@ -310,9 +310,9 @@ override_dh_auto_install: # Rename some stuff with the version name cp $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1 - + cp $(CURDIR)/clang/tools/scan-build/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1 - + cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim |