testing/llvm: upgrade to 2.9

2 files changed, 9 insertions, 91 deletions

diff --git a/testing/llvm/APKBUILD b/testing/llvm/APKBUILD
index fb96a8c547..8cb918730b 100644
--- a/testing/llvm/APKBUILD
+++ b/testing/llvm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=llvm
-pkgver=2.8
+pkgver=2.9
 pkgrel=0
 pkgdesc="low level virtual machine compiler system"
 arch="all"
@@ -13,7 +13,7 @@ install=
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz
 	http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
-        llvm-uclibc-errno-fsckery.patch"
+	"
 
 _builddir="$srcdir"/build
 
@@ -44,6 +44,11 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
+
+	# configure gets it wrong. We do have error_t
+	sed -i -e 's/.*undef HAVE_ERROR_T.*/#define HAVE_ERROR_T 1/'  \
+		-e '/define error_t/d' \
+		./include/llvm/Config/config.h || return 1
 	make || return 1
 }
 
@@ -52,6 +57,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="220d361b4d17051ff4bb21c64abe05ba  llvm-2.8.tgz
-10e14c901fc3728eecbd5b829e011b59  clang-2.8.tgz
-089441aa2369c90a0fd0edaa311cb7d6  llvm-uclibc-errno-fsckery.patch"
+md5sums="793138412d2af2c7c7f54615f8943771  llvm-2.9.tgz
+634de18d04b7a4ded19ec4c17d23cfca  clang-2.9.tgz"
diff --git a/testing/llvm/llvm-uclibc-errno-fsckery.patch b/testing/llvm/llvm-uclibc-errno-fsckery.patch
deleted file mode 100644
index a7335f2684..0000000000
--- a/testing/llvm/llvm-uclibc-errno-fsckery.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- llvm-2.8/lib/Support/CommandLine.cpp
-+++ llvm-2.8.mod/lib/Support/CommandLine.cpp
-@@ -31,7 +31,10 @@
- #include "llvm/ADT/StringMap.h"
- #include "llvm/ADT/Twine.h"
- #include "llvm/Config/config.h"
--#include <cerrno>
-+
-+#include <asm-generic/errno-base.h>
-+extern __thread int errno;
-+
- #include <cstdlib>
- using namespace llvm;
- using namespace cl;
---- llvm-2.8/lib/Support/raw_ostream.cpp
-+++ llvm-2.8.mod/lib/Support/raw_ostream.cpp
-@@ -22,7 +22,10 @@
- #include "llvm/System/Signals.h"
- #include "llvm/ADT/STLExtras.h"
- #include <cctype>
--#include <cerrno>
-+
-+#include <asm-generic/errno-base.h>
-+extern __thread int errno;
-+
- #include <sys/stat.h>
- #include <sys/types.h>
- 
---- llvm-2.8/lib/System/Errno.cpp
-+++ llvm-2.8.mod/lib/System/Errno.cpp
-@@ -14,13 +14,11 @@
- #include "llvm/System/Errno.h"
- #include "llvm/Config/config.h"     // Get autoconf configuration settings
- 
-+extern __thread int errno;
-+
- #if HAVE_STRING_H
- #include <string.h>
- 
--#if HAVE_ERRNO_H
--#include <errno.h>
--#endif
--
- //===----------------------------------------------------------------------===//
- //=== WARNING: Implementation here must contain only TRULY operating system
- //===          independent code.
-@@ -29,11 +27,9 @@
- namespace llvm {
- namespace sys {
- 
--#if HAVE_ERRNO_H
- std::string StrError() {
-   return StrError(errno);
- }
--#endif  // HAVE_ERRNO_H
- 
- std::string StrError(int errnum) {
-   const int MaxErrStrLen = 2000;
---- llvm-2.8/lib/System/Unix/Unix.h
-+++ llvm-2.8.mod/lib/System/Unix/Unix.h
-@@ -24,7 +24,10 @@
- #include <cstdlib>
- #include <cstdio>
- #include <cstring>
--#include <cerrno>
-+
-+#include <asm-generic/errno-base.h>
-+extern __thread int errno;
-+
- #include <string>
- #include <algorithm>
- 
---- llvm-2.8/utils/TableGen/TGLexer.cpp
-+++ llvm-2.8.mod/utils/TableGen/TGLexer.cpp
-@@ -19,7 +19,10 @@
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
--#include <cerrno>
-+
-+#include <asm-generic/errno-base.h>
-+extern __thread int errno;
-+
- using namespace llvm;
- 
- TGLexer::TGLexer(SourceMgr &SM) : SrcMgr(SM) {