From 7ad0c89c865a8e1282d57f0abce57e48d5c6e8ae Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 5 Dec 2013 08:10:17 +0000 Subject: [PATCH] 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. +