From 8ee36a00a530396b43071cbdaf946f8da2286442 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 12 Jan 2013 14:49:42 +0000 Subject: [PATCH] refresh of the patch --- debian/control | 4 ++-- debian/patches/55-lldb-cpp-declaration.diff | 18 ++++++++--------- debian/patches/56-lldb-python-path.diff | 22 ++++++++++----------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/debian/control b/debian/control index e97f1ae1..67b846d9 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect, autoconf, automake1.9, perl, libtool, doxygen, chrpath, texinfo, sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9), lsb-release, patchutils, diffstat, xz-utils, llvm-3.2-dev (>= 3.2), - llvm-3.2-source (>= 3.2), chrpath, python-dev, libedit-dev + llvm-3.2-source (>= 3.2), chrpath, python-dev, libedit-dev, swig Build-Conflicts: oprofile, ocaml Standards-Version: 3.9.3 Homepage: http://www.llvm.org/ @@ -16,7 +16,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/trunk/ Package: clang Architecture: all -Depends: clang-3.2, ${misc:Depends} +Depends: clang-3.2 (>= ${source:Version}), ${misc:Depends} Description: C, C++ and Objective-C compiler (LLVM based) Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Some of its goals include the following: diff --git a/debian/patches/55-lldb-cpp-declaration.diff b/debian/patches/55-lldb-cpp-declaration.diff index 5a55f83a..2387fc2b 100644 --- a/debian/patches/55-lldb-cpp-declaration.diff +++ b/debian/patches/55-lldb-cpp-declaration.diff @@ -1,7 +1,7 @@ -Index: lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp +Index: llvm-3.2.src/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp =================================================================== ---- lldb-3.2.orig/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (revision 169184) -+++ lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (revision 169185) +--- llvm-3.2.src.orig/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp 2013-01-12 15:49:01.575044001 +0100 ++++ llvm-3.2.src/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp 2013-01-12 15:49:03.095043967 +0100 @@ -344,7 +344,7 @@ while (*name_cursor != '\0') @@ -11,10 +11,10 @@ Index: lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleO if (!colon_loc) { selector_components.push_back(&ast_ctx.Idents.get(llvm::StringRef(name_cursor))); -Index: lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +Index: llvm-3.2.src/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp =================================================================== ---- lldb-3.2.orig/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (revision 169184) -+++ lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp (revision 169185) +--- llvm-3.2.src.orig/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp 2013-01-12 15:49:01.575044001 +0100 ++++ llvm-3.2.src/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp 2013-01-12 15:49:03.095043967 +0100 @@ -727,7 +727,8 @@ lldb::addr_t load_addr) : m_process(process), @@ -34,10 +34,10 @@ Index: lldb-3.2/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleO }; class ClassDescriptorV2 : public ObjCLanguageRuntime::ClassDescriptor -Index: lldb-3.2/lldb/source/Interpreter/CommandObject.cpp +Index: llvm-3.2.src/lldb/source/Interpreter/CommandObject.cpp =================================================================== ---- lldb-3.2.orig/lldb/source/Interpreter/CommandObject.cpp (revision 169184) -+++ lldb-3.2/lldb/source/Interpreter/CommandObject.cpp (revision 169185) +--- llvm-3.2.src.orig/lldb/source/Interpreter/CommandObject.cpp 2013-01-12 15:49:01.575044001 +0100 ++++ llvm-3.2.src/lldb/source/Interpreter/CommandObject.cpp 2013-01-12 15:49:03.095043967 +0100 @@ -752,9 +752,9 @@ StreamString sstr; sstr << "One of the following languages:\n"; diff --git a/debian/patches/56-lldb-python-path.diff b/debian/patches/56-lldb-python-path.diff index e307fd94..9332ac81 100644 --- a/debian/patches/56-lldb-python-path.diff +++ b/debian/patches/56-lldb-python-path.diff @@ -1,10 +1,10 @@ -Index: lldb-3.2/lldb/source/Utility/Makefile +Index: llvm-3.2.src/lldb/source/Utility/Makefile =================================================================== ---- lldb-3.2.orig/lldb/source/Utility/Makefile (revision 169766) -+++ lldb-3.2/lldb/source/Utility/Makefile (revision 169767) -@@ -12,4 +12,11 @@ +--- llvm-3.2.src.orig/lldb/source/Utility/Makefile 2013-01-12 15:48:58.415044072 +0100 ++++ llvm-3.2.src/lldb/source/Utility/Makefile 2013-01-12 15:49:05.815043907 +0100 +@@ -11,4 +11,11 @@ + LIBRARYNAME := lldbUtility BUILD_ARCHIVE = 1 - NO_PEDANTIC = 1 +# Enable RTTI on GCC builds because liblldbCore.a requires RTTI. +# See source/Core/Makefile for details. @@ -14,10 +14,10 @@ Index: lldb-3.2/lldb/source/Utility/Makefile + + include $(LLDB_LEVEL)/Makefile -Index: lldb-3.2/lldb/source/Core/Makefile +Index: llvm-3.2.src/lldb/source/Core/Makefile =================================================================== ---- lldb-3.2.orig/lldb/source/Core/Makefile (revision 169766) -+++ lldb-3.2/lldb/source/Core/Makefile (revision 169767) +--- llvm-3.2.src.orig/lldb/source/Core/Makefile 2013-01-12 15:48:58.415044072 +0100 ++++ llvm-3.2.src/lldb/source/Core/Makefile 2013-01-12 15:49:05.815043907 +0100 @@ -11,4 +11,15 @@ LIBRARYNAME := lldbCore BUILD_ARCHIVE = 1 @@ -34,10 +34,10 @@ Index: lldb-3.2/lldb/source/Core/Makefile +endif + include $(LLDB_LEVEL)/Makefile -Index: lldb-3.2/lldb/lib/Makefile +Index: llvm-3.2.src/lldb/lib/Makefile =================================================================== ---- lldb-3.2.orig/lldb/lib/Makefile (revision 169766) -+++ lldb-3.2/lldb/lib/Makefile (revision 169767) +--- llvm-3.2.src.orig/lldb/lib/Makefile 2013-01-12 15:48:58.415044072 +0100 ++++ llvm-3.2.src/lldb/lib/Makefile 2013-01-12 15:49:05.815043907 +0100 @@ -67,6 +67,14 @@ lldbPluginPlatformLinux.a \ lldbPluginPlatformFreeBSD.a