From 851aef33ece6899b797714d2e59d5440d51085ba Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 27 May 2013 13:49:58 +0000 Subject: [PATCH] * New snapshot release (3.4 release) * Add a symlink of libLLVM-3.4.so.1 to usr/lib/llvm-3.4/lib/libLLVM-3.4.so to fix make the llvm-config-3.4 --libdir work (Closes: #708677) * Various packages rename to allow co installations: * libclang1 => libclang1-3.4 * libclang1-dbg => libclang1-3.4-dbg * libclang-dev => libclang-3.4-dev * libclang-common-dev => libclang-common-3.4-dev --- debian/changelog | 15 ++++++- debian/control | 42 +++++-------------- debian/llvm-3.4-dev.links.in | 1 + ...set-is_stmt-a-little-better-for-prol.patch | 14 +++---- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ad33454..62193bc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,17 @@ -llvm-toolchain-snapshot (1:3.4~svn179851-1~exp1) experimental; urgency=low +llvm-toolchain-snapshot (1:3.4~svn182733-1~exp1) experimental; urgency=low + + * New snapshot release (3.4 release) + * Add a symlink of libLLVM-3.4.so.1 to usr/lib/llvm-3.4/lib/libLLVM-3.4.so + to fix make the llvm-config-3.4 --libdir work (Closes: #708677) + * Various packages rename to allow co installations: + * libclang1 => libclang1-3.4 + * libclang1-dbg => libclang1-3.4-dbg + * libclang-dev => libclang-3.4-dev + * libclang-common-dev => libclang-common-3.4-dev + + -- Sylvestre Ledru Mon, 27 May 2013 15:01:57 +0200 + +llvm-toolchain-snapshot (1:3.3~svn179851-1~exp1) experimental; urgency=low * Draft of a snapshot release (3.3) * Enable r600 experimental backend diff --git a/debian/control b/debian/control index 5441fd27..1f102880 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,8 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snap Package: clang-3.4 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-common-dev (= ${binary:Version}), - libclang1 (= ${binary:Version}) + libclang-common-3.4-dev (= ${binary:Version}), + libclang1-3.4 (= ${binary:Version}) Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-3.4-dev, python Replaces: clang (<< 1:3.4), clang-3.1, clang-3.2, compiler-rt @@ -81,7 +81,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation . This package contains the documentation. -Package: libclang1 +Package: libclang1-3.4 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs} Description: clang library @@ -111,11 +111,11 @@ Description: clang library . This package contains the clang library. -Package: libclang1-dbg +Package: libclang1-3.4-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.4 Description: clang library Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Some of its goals include the following: @@ -143,11 +143,11 @@ Description: clang library . This package contains the debugging symbols. -Package: libclang-dev +Package: libclang-3.4-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang1 (= ${binary:Version}), libclang-common-dev (= ${binary:Version}) + libclang1-3.4 (= ${binary:Version}), libclang-common-3.4-dev (= ${binary:Version}) Description: clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Some of its goals include the following: @@ -173,13 +173,13 @@ Description: clang library - Development package * A single unified parser for C, Objective C, C++, and Objective C++ * Conformance with C/C++/ObjC and their variants . - This package contains the clang headers to develop extensions over libclang. + This package contains the clang headers to develop extensions over libclang1-3.4. -Package: libclang-common-dev +Package: libclang-common-3.4-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, libllvm3.4 (= ${binary:Version}) -Replaces: llvm-3.4-dev (<< 1:3.2repack), libclang-dev +Replaces: llvm-3.4-dev (<< 1:3.2repack), libclang-3.4-dev Breaks: llvm-3.4-dev (<< 1:3.2repack) Description: clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end @@ -209,28 +209,6 @@ Description: clang library - Common development package This package contains the clang generic headers and some libraries (profiling, etc). - -# Package: compiler-rt -# Architecture: amd64 i386 -# Replaces: libclang-dev -# Section: libdevel -# Depends: ${misc:Depends}, python -# Description: Runtime C library - LLVM based -# The compiler-rt project is a simple library that provides an implementation of -# the low-level target-specific hooks required by code generation and other -# runtime components. For example, when compiling for a 32-bit target, -# converting a double to a 64-bit unsigned integer is compiling into a runtime -# call to the "__fixunsdfdi" function. The compiler-rt library provides -# optimized implementations of this and other low-level routines. -# . -# The current feature set of compiler-rt is: -# . -# * Full support for the libgcc interfaces on supported targets. -# * High performance hand tuned implementations of commonly used functions -# like __floatundidf in assembly that are dramatically faster than the -# libgcc implementations. -# . - Package: libllvm3.4 Architecture: any Section: libs diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-3.4-dev.links.in index 86afeb51..518412b3 100644 --- a/debian/llvm-3.4-dev.links.in +++ b/debian/llvm-3.4-dev.links.in @@ -1,3 +1,4 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so +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 diff --git a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch index 311ae3e8..1caca69e 100644 --- a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch +++ b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch @@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. test/DebugInfo/X86/ending-run.ll | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) -Index: llvm-toolchain-snapshot_3.3~svn181457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +Index: llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== ---- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-05-08 08:01:41.000000000 +0200 -+++ llvm-toolchain-snapshot_3.3~svn181457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-05-08 20:26:03.000000000 +0200 -@@ -1319,15 +1319,12 @@ +--- llvm.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-05-21 03:03:46.000000000 +0200 ++++ llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-05-27 12:03:01.000000000 +0200 +@@ -1316,15 +1316,12 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_3.3~svn181457/lib/CodeGen/AsmPrinter/DwarfDebug.c if (!DL.isUnknown()) { const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -Index: llvm-toolchain-snapshot_3.3~svn181457/test/DebugInfo/X86/ending-run.ll +Index: llvm/test/DebugInfo/X86/ending-run.ll =================================================================== ---- llvm-toolchain-snapshot_3.3~svn181457.orig/test/DebugInfo/X86/ending-run.ll 2013-04-22 08:12:31.000000000 +0200 -+++ llvm-toolchain-snapshot_3.3~svn181457/test/DebugInfo/X86/ending-run.ll 2013-05-08 20:26:03.000000000 +0200 +--- llvm.orig/test/DebugInfo/X86/ending-run.ll 2013-04-22 08:12:31.000000000 +0200 ++++ llvm/test/DebugInfo/X86/ending-run.ll 2013-05-27 12:03:01.000000000 +0200 @@ -1,11 +1,9 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj ; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s