From 6510afe00ec76efe359115a6f4f046aa74e5aa05 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 14:12:27 +0000 Subject: [PATCH 01/23] Add the Ocaml ABI dependency (Closes: #731344) --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/rules | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 063dd58a..e3a8ad86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.4 (1:3.4~+rc2-2) unstable; urgency=low + + * Add the Ocaml ABI dependency (Closes: #731344) + + -- + llvm-toolchain-3.4 (1:3.4~+rc2-1) unstable; urgency=low * New testing upstream release diff --git a/debian/control b/debian/control index c2d7839d..fc04e0a5 100644 --- a/debian/control +++ b/debian/control @@ -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/ diff --git a/debian/rules b/debian/rules index e004405c..1f0c0deb 100755 --- a/debian/rules +++ b/debian/rules @@ -108,8 +108,7 @@ ifeq ($(DEB_HOST_ARCH),hurd-i386) endif %: - dh $@ -# --buildsystem=cmake --builddirectory=$(TARGET_BUILD) + dh $@ --with ocaml debian/%: debian/%.in From ae735d86f86ce9f85560e59abc00593eb4e5959b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 14:23:43 +0000 Subject: [PATCH 02/23] Fix a mistake in the name for the repack script --- debian/orig-tar.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 86b73758..3831dc07 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -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 From 4e16d64caebb6d5c7712d9fe4398a8f7d9e9f88b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 14:28:24 +0000 Subject: [PATCH 03/23] Disable LLDB also for mips & mipsel --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3a8ad86..2969b388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.4 (1:3.4~+rc2-2) unstable; urgency=low * Add the Ocaml ABI dependency (Closes: #731344) + * Disable LLDB also for mips & mipsel -- diff --git a/debian/control b/debian/control index fc04e0a5..ecb22d4a 100644 --- a/debian/control +++ b/debian/control @@ -361,8 +361,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.4 -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 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +# 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} Replaces: lldb-3.2, lldb-3.3, lldb-3.5 diff --git a/debian/rules b/debian/rules index 1f0c0deb..8e6c189a 100755 --- a/debian/rules +++ b/debian/rules @@ -103,7 +103,11 @@ else endif LLDB_ENABLE=yes -ifeq ($(DEB_HOST_ARCH),hurd-i386) +# hurd has threading issues +# mips* fails with "undefined references to `__atomic_load_8'" +ifneq (,$(findstring $(DEB_HOST_ARCH),$(LLDB_DISABLE_ARCHS))) +# Disable LLDB for this arch. + LLDB_ENABLE=no endif From 15a23937ce5219ca8255e2f519212b846c4ad6b2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 14:38:01 +0000 Subject: [PATCH 04/23] Fix the changelog ... --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2969b388..25e425f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ llvm-toolchain-3.4 (1:3.4~+rc2-2) unstable; urgency=low * Add the Ocaml ABI dependency (Closes: #731344) * Disable LLDB also for mips & mipsel - -- + -- Sylvestre Ledru Wed, 04 Dec 2013 15:37:39 +0100 llvm-toolchain-3.4 (1:3.4~+rc2-1) unstable; urgency=low From 943b19fcddfef59a0c817e1cdfdef6257b2bea94 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 14:53:47 +0000 Subject: [PATCH 05/23] mistake in the tag of the release --- debian/orig-tar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 3831dc07..a4d461df 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -129,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 From f744e8a5c210ce25f406b7d55a2d782f7d954d0b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 17:57:46 +0000 Subject: [PATCH 06/23] fix some bugs (cherry pick from 3.3) --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8e6c189a..9d6e98a4 100755 --- a/debian/rules +++ b/debian/rules @@ -102,15 +102,17 @@ else COVERITY_ENABLE=0 endif + LLDB_ENABLE=yes +LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" ifneq (,$(findstring $(DEB_HOST_ARCH),$(LLDB_DISABLE_ARCHS))) # Disable LLDB for this arch. - LLDB_ENABLE=no endif + %: dh $@ --with ocaml @@ -118,6 +120,9 @@ endif 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: " From ef93c2865cc04f27efa07159885346566a4327a5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 17:59:26 +0000 Subject: [PATCH 07/23] Disable LLDB also for ia64, mips & mipsel --- debian/changelog | 2 +- debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25e425f5..1b420dc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ llvm-toolchain-3.4 (1:3.4~+rc2-2) unstable; urgency=low * Add the Ocaml ABI dependency (Closes: #731344) - * Disable LLDB also for mips & mipsel + * Disable LLDB also for ia64, mips & mipsel -- Sylvestre Ledru Wed, 04 Dec 2013 15:37:39 +0100 diff --git a/debian/control b/debian/control index ecb22d4a..06ce50a7 100644 --- a/debian/control +++ b/debian/control @@ -361,8 +361,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.4 -Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 -# mips mipsel hurd have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +# 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} Replaces: lldb-3.2, lldb-3.3, lldb-3.5 diff --git a/debian/rules b/debian/rules index 9d6e98a4..053c08ff 100755 --- a/debian/rules +++ b/debian/rules @@ -104,7 +104,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel +LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel ia64 # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" ifneq (,$(findstring $(DEB_HOST_ARCH),$(LLDB_DISABLE_ARCHS))) From 92aa83c48db6fd79dbe05c4f7fb39a2598607850 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 22:54:36 +0000 Subject: [PATCH 08/23] Fix the bad declaration on the lldb desactivation --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b420dc7..b62fcfa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.4 (1:3.4~+rc2-3) UNRELEASED; urgency=low + + * Fix the bad declaration on the lldb desactivation + + -- Sylvestre Ledru 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) diff --git a/debian/rules b/debian/rules index 053c08ff..cfffaa73 100755 --- a/debian/rules +++ b/debian/rules @@ -107,7 +107,7 @@ LLDB_ENABLE=yes LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel ia64 # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" -ifneq (,$(findstring $(DEB_HOST_ARCH),$(LLDB_DISABLE_ARCHS))) +ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. LLDB_ENABLE=no endif From 06910431c1b364086cf52f25653f17d3e87c3656 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Dec 2013 23:18:31 +0000 Subject: [PATCH 09/23] Also disable lldb under powerpc --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b62fcfa8..3417a2a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.4 (1:3.4~+rc2-3) UNRELEASED; urgency=low * Fix the bad declaration on the lldb desactivation + * Also disable lldb under powerpc -- Sylvestre Ledru Wed, 04 Dec 2013 23:53:49 +0100 diff --git a/debian/control b/debian/control index 06ce50a7..4d476d23 100644 --- a/debian/control +++ b/debian/control @@ -361,8 +361,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.4 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 -# ia64 mips mipsel hurd have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +# ia64 mips mipsel powerpc hurd have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev Pre-Depends: ${misc:Pre-Depends} Replaces: lldb-3.2, lldb-3.3, lldb-3.5 diff --git a/debian/rules b/debian/rules index cfffaa73..9421a39e 100755 --- a/debian/rules +++ b/debian/rules @@ -104,7 +104,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel ia64 +LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel ia64 powerpc # hurd has threading issues # mips* fails with "undefined references to `__atomic_load_8'" ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) From 7ad0c89c865a8e1282d57f0abce57e48d5c6e8ae Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 5 Dec 2013 08:10:17 +0000 Subject: [PATCH 10/23] Hopefully, fix lldb under Kfreebsd-* (thanks to Ed Maste if it works) --- debian/changelog | 1 + debian/patches/30-kfreebsd.diff | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3417a2a4..408f6c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.4 (1:3.4~+rc2-3) UNRELEASED; 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 Wed, 04 Dec 2013 23:53:49 +0100 diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index 35eab6af..68353c50 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.h 2013-11-04 09:08:57.592586614 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.h 2013-11-04 09:08:57.588586613 +0100 +--- 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; @@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.h protected: virtual Tool *getTool(Action::ActionClass AC) const; -Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:08:57.592586614 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:08:57.592586614 +0100 -@@ -960,6 +960,13 @@ +--- 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; } @@ -29,3 +29,16 @@ Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp /// \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. + From b64f2d091c5026dcd2f5b06161822fcc61894f88 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 9 Dec 2013 16:36:33 +0000 Subject: [PATCH 11/23] uploaded --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 408f6c9a..7c9b15f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-3.4 (1:3.4~+rc2-3) UNRELEASED; urgency=low +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 From 251c7df5d281f4c8e4c16cca9af84907d8d3a3e3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 9 Dec 2013 16:40:09 +0000 Subject: [PATCH 12/23] Relative call in the chroot without proc failed. See: fix-an-issue-in-chroot-witout-proc.diff --- debian/changelog | 7 +++ .../fix-an-issue-in-chroot-witout-proc.diff | 61 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 69 insertions(+) create mode 100644 debian/patches/fix-an-issue-in-chroot-witout-proc.diff diff --git a/debian/changelog b/debian/changelog index 7c9b15f0..29fa8755 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.4 (1:3.4~+rc2-4) UNRELEASED; urgency=low + + * Relative call in the chroot without proc failed. + See: fix-an-issue-in-chroot-witout-proc.diff + + -- Sylvestre Ledru Mon, 09 Dec 2013 17:37:49 +0100 + llvm-toolchain-3.4 (1:3.4~+rc2-3) unstable; urgency=low * Fix the bad declaration on the lldb desactivation diff --git a/debian/patches/fix-an-issue-in-chroot-witout-proc.diff b/debian/patches/fix-an-issue-in-chroot-witout-proc.diff new file mode 100644 index 00000000..631303a9 --- /dev/null +++ b/debian/patches/fix-an-issue-in-chroot-witout-proc.diff @@ -0,0 +1,61 @@ +Index: llvm-toolchain-3.4-3.4~+rc1/lib/Support/Unix/Path.inc +=================================================================== +--- llvm-toolchain-3.4-3.4~+rc1.orig/lib/Support/Unix/Path.inc (révision 196790) ++++ llvm-toolchain-3.4-3.4~+rc1/lib/Support/Unix/Path.inc (révision 196791) +@@ -184,15 +184,15 @@ + defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) || \ + defined(__linux__) || defined(__CYGWIN__) || defined(__DragonFly__) + static int +-test_dir(char buf[PATH_MAX], char ret[PATH_MAX], +- const char *dir, const char *bin) +-{ ++test_dir(char ret[PATH_MAX], const char *dir, const char *bin) ++{ + struct stat sb; ++ char fullpath[PATH_MAX]; + +- snprintf(buf, PATH_MAX, "%s/%s", dir, bin); +- if (realpath(buf, ret) == NULL) ++ snprintf(fullpath, PATH_MAX, "%s/%s", dir, bin); ++ if (realpath(fullpath, ret) == NULL) + return (1); +- if (stat(buf, &sb) != 0) ++ if (stat(fullpath, &sb) != 0) + return (1); + + return (0); +@@ -201,20 +201,21 @@ + static char * + getprogpath(char ret[PATH_MAX], const char *bin) + { +- char *pv, *s, *t, buf[PATH_MAX]; ++ char *pv, *s, *t; + + /* First approach: absolute path. */ + if (bin[0] == '/') { +- if (test_dir(buf, ret, "/", bin) == 0) ++ if (test_dir(ret, "/", bin) == 0) + return (ret); + return (NULL); + } + + /* Second approach: relative path. */ + if (strchr(bin, '/') != NULL) { +- if (getcwd(buf, PATH_MAX) == NULL) ++ char cwd[PATH_MAX]; ++ if (getcwd(cwd, PATH_MAX) == NULL) + return (NULL); +- if (test_dir(buf, ret, buf, bin) == 0) ++ if (test_dir(ret, cwd, bin) == 0) + return (ret); + return (NULL); + } +@@ -226,7 +227,7 @@ + if (pv == NULL) + return (NULL); + while ((t = strsep(&s, ":")) != NULL) { +- if (test_dir(buf, ret, t, bin) == 0) { ++ if (test_dir(ret, t, bin) == 0) { + free(pv); + return (ret); + } diff --git a/debian/patches/series b/debian/patches/series index d3485c7a..148f8e9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,3 +32,4 @@ debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff +fix-an-issue-in-chroot-witout-proc.diff From 0e002891baff9736133c51b51c408a54d548d742 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Dec 2013 09:45:05 +0000 Subject: [PATCH 13/23] Fix a build failure in lldb (missing declaration) --- debian/changelog | 5 +++-- debian/patches/lldb-missing-declaration.diff | 12 ++++++++++++ debian/patches/series | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 debian/patches/lldb-missing-declaration.diff diff --git a/debian/changelog b/debian/changelog index 29fa8755..dfd70140 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -llvm-toolchain-3.4 (1:3.4~+rc2-4) UNRELEASED; urgency=low +llvm-toolchain-3.4 (1:3.4~+-1~exp1) UNRELEASED; urgency=low * Relative call in the chroot without proc failed. See: fix-an-issue-in-chroot-witout-proc.diff + * Fix a build failure in lldb (missing declaration) - -- Sylvestre Ledru Mon, 09 Dec 2013 17:37:49 +0100 + -- Sylvestre Ledru Sun, 15 Dec 2013 21:54:01 +0100 llvm-toolchain-3.4 (1:3.4~+rc2-3) unstable; urgency=low diff --git a/debian/patches/lldb-missing-declaration.diff b/debian/patches/lldb-missing-declaration.diff new file mode 100644 index 00000000..a8578058 --- /dev/null +++ b/debian/patches/lldb-missing-declaration.diff @@ -0,0 +1,12 @@ +Index: llvm-toolchain-3.4_3.4~+/lldb/source/Host/common/Host.cpp +=================================================================== +--- llvm-toolchain-3.4_3.4~+.orig/lldb/source/Host/common/Host.cpp 2013-12-15 21:56:52.000000000 +0100 ++++ llvm-toolchain-3.4_3.4~+/lldb/source/Host/common/Host.cpp 2013-12-16 10:08:05.144077914 +0100 +@@ -1217,6 +1217,7 @@ + } + if (tmpdir_cstr) + { ++ Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); + g_lldb_tmp_dir.SetCString(tmpdir_cstr); + if (log) + log->Printf("Host::GetLLDBPath(ePathTypeLLDBTempSystemDir) => '%s'", g_lldb_tmp_dir.GetCString()); diff --git a/debian/patches/series b/debian/patches/series index 148f8e9d..dc3659d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,5 @@ debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff fix-an-issue-in-chroot-witout-proc.diff +lldb-missing-declaration.diff + From 914303d8b505b9db76381209286ff5e2ce8b2873 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Dec 2013 09:52:21 +0000 Subject: [PATCH 14/23] Actually, I committed the fix upstream --- debian/changelog | 1 - debian/patches/lldb-missing-declaration.diff | 12 ------------ debian/patches/series | 2 -- 3 files changed, 15 deletions(-) delete mode 100644 debian/patches/lldb-missing-declaration.diff diff --git a/debian/changelog b/debian/changelog index dfd70140..bdd4f6f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ llvm-toolchain-3.4 (1:3.4~+-1~exp1) UNRELEASED; urgency=low * Relative call in the chroot without proc failed. See: fix-an-issue-in-chroot-witout-proc.diff - * Fix a build failure in lldb (missing declaration) -- Sylvestre Ledru Sun, 15 Dec 2013 21:54:01 +0100 diff --git a/debian/patches/lldb-missing-declaration.diff b/debian/patches/lldb-missing-declaration.diff deleted file mode 100644 index a8578058..00000000 --- a/debian/patches/lldb-missing-declaration.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: llvm-toolchain-3.4_3.4~+/lldb/source/Host/common/Host.cpp -=================================================================== ---- llvm-toolchain-3.4_3.4~+.orig/lldb/source/Host/common/Host.cpp 2013-12-15 21:56:52.000000000 +0100 -+++ llvm-toolchain-3.4_3.4~+/lldb/source/Host/common/Host.cpp 2013-12-16 10:08:05.144077914 +0100 -@@ -1217,6 +1217,7 @@ - } - if (tmpdir_cstr) - { -+ Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); - g_lldb_tmp_dir.SetCString(tmpdir_cstr); - if (log) - log->Printf("Host::GetLLDBPath(ePathTypeLLDBTempSystemDir) => '%s'", g_lldb_tmp_dir.GetCString()); diff --git a/debian/patches/series b/debian/patches/series index dc3659d5..148f8e9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,5 +33,3 @@ debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff fix-an-issue-in-chroot-witout-proc.diff -lldb-missing-declaration.diff - From ccc064e352f7d83e99c2746f047c51db25c2a0b1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Dec 2013 10:33:34 +0000 Subject: [PATCH 15/23] * New testing upstream release * Bring back lldb-link-atomic.diff to make sure lldb builds under powerpc --- debian/changelog | 7 +++++-- debian/control | 4 ++-- debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdd4f6f2..2c36c4d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -llvm-toolchain-3.4 (1:3.4~+-1~exp1) UNRELEASED; urgency=low +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 - -- Sylvestre Ledru Sun, 15 Dec 2013 21:54:01 +0100 + -- Sylvestre Ledru Tue, 17 Dec 2013 11:27:40 +0100 llvm-toolchain-3.4 (1:3.4~+rc2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 4d476d23..d58902fc 100644 --- a/debian/control +++ b/debian/control @@ -361,8 +361,8 @@ 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 -# ia64 mips mipsel powerpc hurd have 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.4 (= ${binary:Version}), python, llvm-3.4-dev Pre-Depends: ${misc:Pre-Depends} Replaces: lldb-3.2, lldb-3.3, lldb-3.5 diff --git a/debian/patches/series b/debian/patches/series index 148f8e9d..644b5bd5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff fix-an-issue-in-chroot-witout-proc.diff +lldb-link-atomic.diff diff --git a/debian/rules b/debian/rules index 9421a39e..cfffaa73 100755 --- a/debian/rules +++ b/debian/rules @@ -104,7 +104,7 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := hurd-i386 mips mipsel ia64 powerpc +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))) From bf6ebbcaff10b7f2f34a46eecdd92974439382a8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Dec 2013 10:25:00 +0000 Subject: [PATCH 16/23] Also limit the number of archs for liblldb-dev --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2c36c4d7..254baef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low 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 Tue, 17 Dec 2013 11:27:40 +0100 diff --git a/debian/control b/debian/control index d58902fc..5baa71be 100644 --- a/debian/control +++ b/debian/control @@ -373,7 +373,8 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: lldb-3.4-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.4 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger - Header files From e2910dc33204ff04cce351b2f6720681eb6c989a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 20 Dec 2013 17:37:26 +0000 Subject: [PATCH 17/23] Remove explicit dep on gcc 4.8 --- debian/changelog | 6 ++++++ debian/control | 3 ++- debian/rules | 3 +-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 254baef5..af46f1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.4 (1:3.4~+rc3-2) UNRELEASED; urgency=medium + + * Remove explicit dep on gcc 4.8 + + -- Sylvestre Ledru Fri, 20 Dec 2013 18:36:58 +0100 + llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low * New testing upstream release diff --git a/debian/control b/debian/control index 5baa71be..5db0caa8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,8 @@ 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, dh-ocaml + lcov, procps, help2man, dh-ocaml +# gcc-4.8, g++-4.8, Build-Conflicts: oprofile, ocaml Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ diff --git a/debian/rules b/debian/rules index cfffaa73..54bba52c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,7 @@ TARGET_BUILD := build-llvm # Force the version of gcc. Some archs are still using gcc 4.6 -GCC_VERSION := 4.8 -# $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') +GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') LLVM_VERSION := 3.4 SONAME_EXT := 1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p') From 82763da44adb18e5664ac6cd78b304ca92e73fd0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 22 Dec 2013 14:55:23 +0000 Subject: [PATCH 18/23] Only link against latomic under mips* --- debian/patches/lldb-link-atomic.diff | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff index 3bfe368b..ebf29f89 100644 --- a/debian/patches/lldb-link-atomic.diff +++ b/debian/patches/lldb-link-atomic.diff @@ -5,12 +5,14 @@ Last-Update: 2013-08-21 --- llvm-toolchain-3.3-3.3.orig/lldb/lib/Makefile +++ llvm-toolchain-3.3-3.3/lldb/lib/Makefile -@@ -140,6 +140,8 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L +@@ -140,6 +140,10 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L LLVMLibsOptions += -Wl,--no-undefined # Link in python LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt ++ ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel)) + # Link GCC atomic helper library + LLVMLibsOptions += -latomic ++ endif LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) endif From 658062dc4e09a6fd34d1371097acdf3caf5bc1ff Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 25 Dec 2013 13:14:40 +0000 Subject: [PATCH 19/23] New upstream release --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index af46f1fb..36b757ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-3.4 (1:3.4~+rc3-2) UNRELEASED; urgency=medium +llvm-toolchain-3.4 (1:3.4-1) unstable; urgency=medium + * New upstream release * Remove explicit dep on gcc 4.8 -- Sylvestre Ledru Fri, 20 Dec 2013 18:36:58 +0100 From 59ddcf4ff9bac2f68e6748fc0e6e1117a485430b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 15 Jan 2014 10:20:04 +0000 Subject: [PATCH 20/23] Only explicit the link against atomic when running mips & mipsel --- debian/changelog | 6 ++++++ debian/patches/lldb-link-atomic.diff | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 36b757ed..f6d5a2b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium + + * Only explicit the link against atomic when running mips & mipsel + + -- Sylvestre Ledru Wed, 15 Jan 2014 11:19:21 +0100 + llvm-toolchain-3.4 (1:3.4-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff index ebf29f89..a9ac408e 100644 --- a/debian/patches/lldb-link-atomic.diff +++ b/debian/patches/lldb-link-atomic.diff @@ -9,7 +9,7 @@ Last-Update: 2013-08-21 LLVMLibsOptions += -Wl,--no-undefined # Link in python LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -+ ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel)) ++ ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe)) + # Link GCC atomic helper library + LLVMLibsOptions += -latomic + endif From 6bb537d522fcf5cd279e7f018d25cb56944e2310 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 15 Jan 2014 14:11:10 +0000 Subject: [PATCH 21/23] Fix the cindex.py declaration (3.3 => 3.5). Closes upstream bug #18365 --- debian/changelog | 1 + debian/patches/python-clangpath.diff | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f6d5a2b9..6437b531 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium * Only explicit the link against atomic when running mips & mipsel + * Fix the cindex.py declaration (3.3 => 3.5). Closes upstream bug #18365 -- Sylvestre Ledru Wed, 15 Jan 2014 11:19:21 +0100 diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 92f5f13a..14fd5d7f 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.4~svn193982/clang/bindings/python/clang/cindex. file = 'libclang.dll' else: - file = 'libclang.so' -+ file = 'libclang-3.3.so' ++ file = 'libclang-3.4.so' if Config.library_path: file = Config.library_path + '/' + file From 282960741d93094875dad71eae151880539ef4c3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Feb 2014 11:40:16 +0000 Subject: [PATCH 22/23] Bring back the dependency on gcc 4.8. It breaks the nightly snapshot packages and it should be the norm now... --- debian/changelog | 2 ++ debian/control | 4 ++-- debian/rules | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6437b531..83f6ed97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium * Only explicit the link against atomic when running mips & mipsel * Fix the cindex.py declaration (3.3 => 3.5). Closes upstream bug #18365 + * Bring back the dependency on gcc 4.8. It breaks the nightly snapshot + packages and it should be the norm now... -- Sylvestre Ledru Wed, 15 Jan 2014 11:19:21 +0100 diff --git a/debian/control b/debian/control index 5db0caa8..be9070fd 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ 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, dh-ocaml -# gcc-4.8, g++-4.8, + lcov, procps, help2man, dh-ocaml, + gcc-4.8, g++-4.8, Build-Conflicts: oprofile, ocaml Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ diff --git a/debian/rules b/debian/rules index 54bba52c..e59af742 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,8 @@ TARGET_BUILD := build-llvm # Force the version of gcc. Some archs are still using gcc 4.6 -GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') +GCC_VERSION := 4.8 +#GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') LLVM_VERSION := 3.4 SONAME_EXT := 1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p') From c3eb489b0f09910400bc6f33b9e014cccedeeb4a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 11 Feb 2014 14:51:01 +0000 Subject: [PATCH 23/23] * Fixed build directory for llvm-config * Add Unittests for running tests for llvm-based projects * Install FileCheck and not for testing --- debian/changelog | 7 ++- debian/llvm-3.4-dev.dirs | 2 + debian/llvm-3.4-dev.install | 5 ++ debian/llvm-3.4-dev.links.in | 35 +++++++++++++ .../patches/0007-install-dejagnu-files.patch | 49 +++++++++++++++++++ .../fix-llvm-config-obj-src-root.patch | 16 ++++++ debian/patches/series | 2 + 7 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0007-install-dejagnu-files.patch create mode 100644 debian/patches/fix-llvm-config-obj-src-root.patch diff --git a/debian/changelog b/debian/changelog index 83f6ed97..2ae9a801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,12 @@ 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... - -- Sylvestre Ledru Wed, 15 Jan 2014 11:19:21 +0100 + [ Martin Nowack ] + * Fixed build directory for llvm-config + * Add Unittests for running tests for llvm-based projects + * Install FileCheck and not for testing + + -- Sylvestre Ledru Tue, 11 Feb 2014 11:19:21 +0100 llvm-toolchain-3.4 (1:3.4-1) unstable; urgency=medium diff --git a/debian/llvm-3.4-dev.dirs b/debian/llvm-3.4-dev.dirs index 5dac3aa4..45054f3c 100644 --- a/debian/llvm-3.4-dev.dirs +++ b/debian/llvm-3.4-dev.dirs @@ -1,5 +1,7 @@ /usr/lib/llvm-3.4/lib /usr/lib/llvm-3.4/build /usr/lib/llvm-3.4/include +/usr/lib/llvm-3.4/build/unittests +/usr/lib/llvm-3.4/build/utils/lit/ usr/share/doc/llvm-3.4-dev usr/share/emacs/site-lisp/llvm-3.4 diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-3.4-dev.install index 447ed1d3..d943b774 100644 --- a/debian/llvm-3.4-dev.install +++ b/debian/llvm-3.4-dev.install @@ -1,3 +1,5 @@ +usr/lib/llvm-3.4/bin/not* +usr/lib/llvm-3.4/bin/FileCheck* usr/lib/llvm-3.4/lib/libLLVM*.a usr/lib/llvm-3.4/lib/libllvm*.a usr/lib/llvm-3.4/lib/LLVM*.so @@ -12,10 +14,13 @@ build-llvm/config.status /usr/lib/llvm-3.4/build/ Makefile.rules /usr/lib/llvm-3.4/build/ configure /usr/lib/llvm-3.4/build/ autoconf/ /usr/lib/llvm-3.4/build/ +unittests/Makefile.unittest /usr/lib/llvm-3.4/build/unittests/ utils/vim/llvm-3.4.vim usr/share/vim/addons/syntax/ utils/vim/tablegen-3.4.vim usr/share/vim/addons/syntax/ +utils/lit/* /usr/lib/llvm-3.4/build/utils/lit/ + utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.4/ utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.4/ utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.4/ diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-3.4-dev.links.in index 518412b3..fb27cb6a 100644 --- a/debian/llvm-3.4-dev.links.in +++ b/debian/llvm-3.4-dev.links.in @@ -2,3 +2,38 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libL usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.so usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/include/llvm-c usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/include/llvm +usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/build/include/llvm-c +usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/build/include/llvm +usr/lib/llvm-3.4/include/ usr/lib/llvm-3.4/build/include +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Coverage+Asserts diff --git a/debian/patches/0007-install-dejagnu-files.patch b/debian/patches/0007-install-dejagnu-files.patch new file mode 100644 index 00000000..416c7c21 --- /dev/null +++ b/debian/patches/0007-install-dejagnu-files.patch @@ -0,0 +1,49 @@ +From: LLVM Packaging Team +Date: Fri, 5 Apr 2013 17:32:20 +0200 +Subject: install-dejagnu-files.patch + +--- + utils/FileCheck/Makefile | 2 +- + utils/count/Makefile | 2 +- + utils/not/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile +index 268b7bc..e7674f9 100644 +--- a/utils/FileCheck/Makefile ++++ b/utils/FileCheck/Makefile +@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a + TOOL_NO_EXPORTS = 1 + + # Don't install this utility +-NO_INSTALL = 1 ++#NO_INSTALL = 1 + + include $(LEVEL)/Makefile.common + +diff --git a/utils/count/Makefile b/utils/count/Makefile +index 8de076a..41447d5 100644 +--- a/utils/count/Makefile ++++ b/utils/count/Makefile +@@ -15,6 +15,6 @@ USEDLIBS = + TOOL_NO_EXPORTS = 1 + + # Don't install this utility +-NO_INSTALL = 1 ++# NO_INSTALL = 1 + + include $(LEVEL)/Makefile.common +diff --git a/utils/not/Makefile b/utils/not/Makefile +index f37f166..48e9286 100644 +--- a/utils/not/Makefile ++++ b/utils/not/Makefile +@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a + TOOL_NO_EXPORTS = 1 + + # Don't install this utility +-NO_INSTALL = 1 ++# NO_INSTALL = 1 + + include $(LEVEL)/Makefile.common + +-- diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch new file mode 100644 index 00000000..083f8006 --- /dev/null +++ b/debian/patches/fix-llvm-config-obj-src-root.patch @@ -0,0 +1,16 @@ +Index: llvm-toolchain-3.3/tools/llvm-config/llvm-config.cpp +=================================================================== +--- llvm-toolchain-3.3.orig/tools/llvm-config/llvm-config.cpp 2013-11-26 10:49:16.183929247 +0100 ++++ llvm-toolchain-3.3/tools/llvm-config/llvm-config.cpp 2013-11-26 10:49:16.179929247 +0100 +@@ -302,9 +302,9 @@ + } else if (Arg == "--build-mode") { + OS << LLVM_BUILDMODE << '\n'; + } else if (Arg == "--obj-root") { +- OS << LLVM_OBJ_ROOT << '\n'; ++ OS << ActivePrefix << "/build/" << '\n'; + } else if (Arg == "--src-root") { +- OS << LLVM_SRC_ROOT << '\n'; ++ OS << ActivePrefix << "/build/" << '\n'; + } else { + usage(); + } diff --git a/debian/patches/series b/debian/patches/series index 644b5bd5..f5a89149 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,3 +34,5 @@ force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff fix-an-issue-in-chroot-witout-proc.diff lldb-link-atomic.diff +0007-install-dejagnu-files.patch +fix-llvm-config-obj-src-root.patch