diff --git a/debian/changelog b/debian/changelog index 32b6ac4b..7c542507 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +llvm-toolchain-snapshot (1:3.8~svn246420-1~exp1) experimental; urgency=medium + + * New snapshot release + * remove patches merge upstream + - bug783205.patch + - kfreebsd-build-fix.patch + + -- Sylvestre Ledru Mon, 31 Aug 2015 08:55:22 +0200 + llvm-toolchain-snapshot (1:3.8~svn245286-3) UNRELEASED; urgency=medium [ Gianfranco Costamagna ] diff --git a/debian/patches/bug783205.patch b/debian/patches/bug783205.patch deleted file mode 100644 index 463e984b..00000000 --- a/debian/patches/bug783205.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Steven Chamberlain -Date: Sun, 10 May 2015 19:46:59 +0100 -Subject: support Debian s390x multiarch paths - ---- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp -+++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp -@@ -3092,6 +3092,10 @@ static std::string getMultiarchTriple(co - if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu")) - return "sparc64-linux-gnu"; - break; -+ case llvm::Triple::systemz: -+ if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu")) -+ return "s390x-linux-gnu"; -+ break; - } - return TargetTriple.str(); - } -@@ -3435,6 +3439,8 @@ void Linux::AddClangSystemIncludeArgs(co - "/usr/include/sparc-linux-gnu"}; - const StringRef Sparc64MultiarchIncludeDirs[] = { - "/usr/include/sparc64-linux-gnu"}; -+ const StringRef SYSTEMZMultiarchIncludeDirs[] = { -+ "/usr/include/s390x-linux-gnu"}; - ArrayRef MultiarchIncludeDirs; - switch (getTriple().getArch()) { - case llvm::Triple::x86_64: -@@ -3480,6 +3486,9 @@ void Linux::AddClangSystemIncludeArgs(co - case llvm::Triple::sparcv9: - MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs; - break; -+ case llvm::Triple::systemz: -+ MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs; -+ break; - default: - break; - } ---- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp -+++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp -@@ -8058,7 +8058,7 @@ static std::string getLinuxDynamicLinker - return "/lib64/ld64.so.1"; - return "/lib64/ld64.so.2"; - } else if (Arch == llvm::Triple::systemz) -- return "/lib64/ld64.so.1"; -+ return "/lib/ld64.so.1"; - else if (Arch == llvm::Triple::sparcv9) - return "/lib64/ld-linux.so.2"; - else if (Arch == llvm::Triple::x86_64 && diff --git a/debian/patches/kfreebsd-build-fix.patch b/debian/patches/kfreebsd-build-fix.patch deleted file mode 100644 index 250abc52..00000000 --- a/debian/patches/kfreebsd-build-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -## Description: add some description -## Origin/Author: add some origin or author -## Bug: bug URL -Description: Avoid usage of F_DUPFD_CLOEXEC where not available (e.g. kfreebsd*) - The patch is mostly taken from 10_kfreebsd-f_dupfd_cloexec.patch (gnome-terminal) - Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711529 - Description: Fix build on kfreebsd - - kfreebsd doesn't have F_DUPFD_CLOEXEC, so use it conditionally. - As mentioned in the bug report, it will have support for it in - jessie, so we can drop it in jessie+1 - Author: Emilio Pozuelo Monfort - Author: Petr Salinger - -Author: Gianfranco Costamagna ---- llvm-toolchain-3.7-3.7~+rc3.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp -+++ llvm-toolchain-3.7-3.7~+rc3/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp -@@ -462,11 +462,24 @@ ProcessPOSIX::DoLaunch (Module *module, - int terminal = m_monitor->GetTerminalFD(); - if (terminal >= 0) { - // The reader thread will close the file descriptor when done, so we pass it a copy. -+#ifdef F_DUPFD_CLOEXEC - int stdio = fcntl(terminal, F_DUPFD_CLOEXEC, 0); - if (stdio == -1) { - error.SetErrorToErrno(); - return error; - } -+#else -+ int stdio = fcntl(terminal, F_DUPFD, 0); -+ if (stdio == -1) { -+ error.SetErrorToErrno(); -+ return error; -+ } -+ stdio = fcntl(terminal, F_SETFD, FD_CLOEXEC); -+ if (stdio == -1) { -+ error.SetErrorToErrno(); -+ return error; -+ } -+#endif - SetSTDIOFileDescriptor(stdio); - } diff --git a/debian/patches/series b/debian/patches/series index e9cae4a7..1d27036a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,6 +39,4 @@ lit-lang.diff compiler-rt-i586.diff clang-analyzer-force-version.diff locale-issue-ld.diff -bug783205.patch fix-cmake-config-prefix.diff -kfreebsd-build-fix.patch