From c9dabfe2cc689ca163b685f112a000dd5ba99be7 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 23 Jul 2014 09:43:15 +0000
Subject: [PATCH] * First RC release of the 3.5 llvm toolchain * Apply
 lldb-kfreebsd.diff patch to fix FTBFS under KFreeBSD   Thanks to Ed Maste

---
 debian/changelog                  |  8 ++++++++
 debian/control                    |  2 +-
 debian/orig-tar.sh                |  5 +++--
 debian/patches/lldb-kfreebsd.diff | 24 ++++++++++++++++++++++++
 debian/patches/series             |  1 +
 5 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/lldb-kfreebsd.diff

diff --git a/debian/changelog b/debian/changelog
index 4182a9fd..7398af13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-3.5 (1:3.5~+rc1-1) unstable; urgency=medium
+
+  * First RC release of the 3.5 llvm toolchain
+  * Apply lldb-kfreebsd.diff patch to fix FTBFS under KFreeBSD
+    Thanks to Ed Maste
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 23 Jul 2014 08:57:59 +0200
+
 llvm-toolchain-snapshot (1:3.5~svn213451-1) unstable; urgency=medium
 
   * New snapshot release
diff --git a/debian/control b/debian/control
index 656f6d6f..44fabc9b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: llvm-toolchain-snapshot
+Source: llvm-toolchain-3.5
 Section: devel
 Priority: optional
 Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 343b5688..a36580ec 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -72,8 +72,9 @@ else
 fi
 
 if test -n "$RCRELEASE"; then
-    VERSION=$MAJOR_VERSION"+"$REVISION # WAS TAG
-    FULL_VERSION="llvm-toolchain"$MAJOR_VERSION"_"$VERSION
+#    VERSION=$MAJOR_VERSION"+"$REVISION # WAS TAG
+    VERSION=$MAJOR_VERSION"~+"$TAG
+    FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION
 else
     VERSION=$CURRENT_VERSION"~svn"$REVISION
     FULL_VERSION="llvm-toolchain-snapshot_"$VERSION
diff --git a/debian/patches/lldb-kfreebsd.diff b/debian/patches/lldb-kfreebsd.diff
new file mode 100644
index 00000000..7b348c9a
--- /dev/null
+++ b/debian/patches/lldb-kfreebsd.diff
@@ -0,0 +1,24 @@
+%diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldllvm-toolchain-snapshot_3.5~svn201241/lldb/source/Host/freebsd/Host.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb/source/Host/freebsd/Host.cpp
+index 4f6af67..47cbb25 100644
+--- llvm-toolchain-snapshot_3.5~svn201241.orig/lldllvm-toolchain-snapshot_3.5~svn201241/lldb/source/Host/freebsd/Host.cpp
++++ llvm-toolchain-snapshot_3.5~svn201241/lldb/source/Host/freebsd/Host.cpp
+@@ -83,6 +83,18 @@ Host::ThreadCreated (const char *thread_name)
+     Host::SetShortThreadName (LLDB_INVALID_PROCESS_ID, LLDB_INVALID_THREAD_ID, thread_name, 16);
+ }
+
++// Debian kFreeBSD uses the FreeBSD kernel with a GNU libc
++#ifdef __GLIBC__
++static inline void *
++reallocf(void *ptr, size_t size)
++{
++    void *rv = realloc(ptr, size);
++    if (rv == NULL)
++        free(ptr);
++    return rv;
++}
++#endif
++
+ std::string
+ Host::GetThreadName (lldb::pid_t pid, lldb::tid_t tid)
+ {
+
diff --git a/debian/patches/series b/debian/patches/series
index fcdcc186..84e7c041 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,4 @@ lldb-soname.diff
 force-link-pass.o.diff
 follow-parallel-var.diff
 scan-build-search-path.diff
+lldb-kfreebsd.diff