proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-31 08:16:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Merge changes from 1:3.4~+rc3-1

Browse Source 
* New testing upstream release
* Relative call in the chroot without proc failed.
  See: fix-an-issue-in-chroot-witout-proc.diff
* Bring back lldb-link-atomic.diff to make sure lldb builds under
  powerpc
* Also limit the number of archs for liblldb-dev
* Fix the bad declaration on the lldb desactivation
* Also disable lldb under powerpc
* Hopefully, fix lldb under Kfreebsd-* (thanks to Ed Maste if it works)
* Add the Ocaml ABI dependency (Closes: #731344)
* Disable LLDB also for ia64, mips & mipsel
This commit is contained in:
Sylvestre Ledru 2013-12-18 13:03:38 +00:00
parent 6422b5e69c
commit 03b2cfea92
6 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
debian/changelog vendored
View File

@ -1,9 +1,10 @@
llvm-toolchain-snapshot (1:3.5~svn197156-1~exp1) UNRELEASED; urgency=low
llvm-toolchain-snapshot (1:3.5~svn197556-1) unstable; urgency=low
* New snapshot release
* Merge changes from 1:3.4~+rc3-1
* Disable much of the display of the lldb display
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 12 Dec 2013 16:30:45 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 17 Dec 2013 12:02:52 +0100
llvm-toolchain-snapshot (1:3.5~svn195337-1) unstable; urgency=low
@ -25,6 +26,32 @@ llvm-toolchain-snapshot (1:3.5~svn195337-1) unstable; urgency=low
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 20 Nov 2013 21:24:28 +0100
llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low
* New testing upstream release
* Relative call in the chroot without proc failed.
See: fix-an-issue-in-chroot-witout-proc.diff
* Bring back lldb-link-atomic.diff to make sure lldb builds under
powerpc
* Also limit the number of archs for liblldb-dev
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 17 Dec 2013 11:27:40 +0100
llvm-toolchain-3.4 (1:3.4~+rc2-3) unstable; urgency=low
* Fix the bad declaration on the lldb desactivation
* Also disable lldb under powerpc
* Hopefully, fix lldb under Kfreebsd-* (thanks to Ed Maste if it works)
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 04 Dec 2013 23:53:49 +0100
llvm-toolchain-3.4 (1:3.4~+rc2-2) unstable; urgency=low
* Add the Ocaml ABI dependency (Closes: #731344)
* Disable LLDB also for ia64, mips & mipsel
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 04 Dec 2013 15:37:39 +0100
llvm-toolchain-3.4 (1:3.4~+rc2-1) unstable; urgency=low
* New testing upstream release

9
debian/control vendored
View File

@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
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,
lcov, procps, help2man, gcc-4.8, g++-4.8
lcov, procps, help2man, gcc-4.8, g++-4.8, dh-ocaml
Build-Conflicts: oprofile, ocaml
Standards-Version: 3.9.5
Homepage: http://www.llvm.org/
@ -353,8 +353,8 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lldb -------------
Package: lldb-3.5
Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32
# Only hurd has been removed
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc
# 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}
Replaces: lldb-3.2, lldb-3.3, lldb-3.4
@ -365,7 +365,8 @@ Description: Next generation, high-performance debugger
Project, such as the Clang expression parser and LLVM disassembler.
Package: lldb-3.5-dev
Architecture: any
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc
# ia64 mips mipsel hurd have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.5 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger - Header files

3
debian/orig-tar.sh vendored
View File

@ -20,6 +20,7 @@ if test -n "$1"; then
# http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/
# For example: sh 3.4/debian/orig-tar.sh release_34
BRANCH=$1
RCRELEASE="true"
fi
if test -n "$1" -a -n "$2"; then
@ -128,7 +129,7 @@ if test -z "$DISTRIBUTION"; then
DISTRIBUTION="experimental"
fi
if test ! -n "$RCRELEASE"; then
if test -n "$RCRELEASE"; then
EXTRA_DCH_FLAGS="--force-bad-version --allow-lower-version"
fi

44
debian/patches/30-kfreebsd.diff vendored Normal file
View File

@ -0,0 +1,44 @@
Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h
===================================================================
--- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.h 2013-11-17 23:36:07.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h 2013-12-05 09:07:45.000000000 +0100
@@ -164,6 +164,8 @@
virtual bool isPICDefault() const;
virtual bool isPIEDefault() const;
virtual bool isPICDefaultForced() const;
+ virtual void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args) const;
protected:
virtual Tool *getTool(Action::ActionClass AC) const;
Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.cpp 2013-12-02 11:00:07.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp 2013-12-05 09:08:49.000000000 +0100
@@ -973,6 +973,13 @@
return GoodVersion;
}
+void Generic_GCC::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args) const {
+ // Under Debian, clang headers are installed into
+ // '/usr/include/clang/VERSION/include/'
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+}
+
/// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering.
bool Generic_GCC::GCCVersion::isOlderThan(int RHSMajor, int RHSMinor,
int RHSPatch,
Index: llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc2.orig/lldb/source/Host/common/Host.cpp 2013-12-05 09:08:49.000000000 +0100
+++ llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp 2013-12-05 09:09:17.294953434 +0100
@@ -1546,7 +1546,7 @@
return error;
}
-#if defined(__linux__) or defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__)
// The functions below implement process launching via posix_spawn() for Linux
// and FreeBSD.

1
debian/patches/series vendored
View File

@ -33,3 +33,4 @@ force-gcc-header-obj.diff
do-not-fail-on-unexpected-pass.diff
silent-more-tests.diff
disable-display-PASS-UNSUPPORTED-XFAIL.diff
lldb-link-atomic.diff

14
debian/rules vendored
View File

@ -102,19 +102,27 @@ else
COVERITY_ENABLE=0
endif
LLDB_ENABLE=yes
ifeq ($(DEB_HOST_ARCH),hurd-i386)
LLDB_DISABLE_ARCHS := 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)))
# Disable LLDB for this arch.
LLDB_ENABLE=no
endif
%:
dh $@
# --buildsystem=cmake --builddirectory=$(TARGET_BUILD)
dh $@ --with ocaml
debian/%: debian/%.in
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@
# Override this two targets. They are trying to manage the .in conversion for me
override_dh_ocamlinit:
override_dh_ocamlclean:
override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang1-$(LLVM_VERSION).links debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc
echo "Using gcc: "