diff --git a/debian/changelog b/debian/changelog index 6bddf103..19f0ada7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -llvm-toolchain-snapshot (1:3.4~svn190051-1) unstable; urgency=low +llvm-toolchain-snapshot (1:3.4~svn190150-1) unstable; urgency=low * New snapshot release * Merge changes from the 3.3 branch (see 1:3.3-9) * Remove ia64-fix.diff (applied upstream) * cpp11-migrate renamed to clang-modernize * lldb-3.4 is back to Architectures: any + * Patch lldb-hurd.diff removed (applied upstream) + * Directory www/ from tarballs polly & lldb removed [ Luca Falavigna ] * debian/control: diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index ec1e414c..ff1895c8 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -81,12 +81,14 @@ rm -rf $COMPILER_RT_TARGET # Polly POLLY_TARGET=polly_$MAJOR_VERSION~svn$REVISION $SVN_CMD $(get_svn_url polly $BRANCH) $POLLY_TARGET +rm -rf $POLLY_TARGET/www tar jcvf llvm-toolchain-snapshot_$MAJOR_VERSION~svn$REVISION.orig-polly.tar.bz2 $POLLY_TARGET rm -rf $POLLY_TARGET # LLDB LLDB_TARGET=lldb_$MAJOR_VERSION~svn$REVISION $SVN_CMD $(get_svn_url lldb $BRANCH) $LLDB_TARGET +rm -rf $LLDB_TARGET/www/ tar jcvf llvm-toolchain-snapshot_$MAJOR_VERSION~svn$REVISION.orig-lldb.tar.bz2 $LLDB_TARGET rm -rf $LLDB_TARGET diff --git a/debian/patches/lldb-hurd.diff b/debian/patches/lldb-hurd.diff deleted file mode 100644 index cf1119f3..00000000 --- a/debian/patches/lldb-hurd.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-snapshot_3.4~svn190038/lldb/include/lldb/Host/Config.h -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn190038.orig/lldb/include/lldb/Host/Config.h 2013-09-05 15:33:30.817207780 +0200 -+++ llvm-toolchain-snapshot_3.4~svn190038/lldb/include/lldb/Host/Config.h 2013-09-05 15:33:30.813207780 +0200 -@@ -14,7 +14,7 @@ - - #include "lldb/Host/macosx/Config.h" - --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__GNU__) - - #include "lldb/Host/linux/Config.h" - -Index: llvm-toolchain-snapshot_3.4~svn190038/lldb/source/Host/common/Host.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn190038.orig/lldb/source/Host/common/Host.cpp 2013-09-05 15:33:30.817207780 +0200 -+++ llvm-toolchain-snapshot_3.4~svn190038/lldb/source/Host/common/Host.cpp 2013-09-05 15:34:09.849206788 +0200 -@@ -22,8 +22,10 @@ - #include - #include - #include -+#ifndef __GNU__ - #include - #endif -+#endif - - #if defined (__APPLE__) - #include diff --git a/debian/patches/series b/debian/patches/series index 85942f13..1720e0fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,5 +26,4 @@ unwind-chain-inclusion.diff hurd-pathmax.diff use-deb-json.diff libprofile_rt_sparc.patch -lldb-hurd.diff libstdc++-header-i386.diff