diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-07-04 13:12:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-07-04 13:13:13 +0000 |
| commit | c57e216aa51ed9a890c215aa1bfe3b1509724432 (patch) | |
| tree | 5ad6655d2e12ac78bb5266535aa5148249b14e2e /main/llvm | |
| parent | 4e1efc2267a494a857b71fc13e8b64444e3d8ff9 (diff) | |
| download | aports-c57e216aa51ed9a890c215aa1bfe3b1509724432.tar.bz2 aports-c57e216aa51ed9a890c215aa1bfe3b1509724432.tar.xz | |
main/llvm: upgrade to 3.1
Diffstat (limited to 'main/llvm')
| -rw-r--r-- | main/llvm/APKBUILD | 16 | ||||
| -rw-r--r-- | main/llvm/clang-3.1-alpine-linux.patch (renamed from main/llvm/clang-3.0-alpine-linux.patch) | 56 |
2 files changed, 35 insertions, 37 deletions
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD index aedb01aec8..659240db88 100644 --- a/main/llvm/APKBUILD +++ b/main/llvm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=llvm -pkgver=3.0 +pkgver=3.1 pkgrel=0 pkgdesc="low level virtual machine compiler system" arch="x86 x86_64" @@ -9,12 +9,12 @@ url="http://llvm.org/" license="UOI-NCSA" depends= depends_dev="perl" -makedepends="$depends_dev groff libffi-dev" +makedepends="$depends_dev groff libffi-dev python" install= subpackages="clang $pkgname-dev $pkgname-doc $pkgname-libs" -source="http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz - clang-3.0-alpine-linux.patch +source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz + clang-3.1-alpine-linux.patch " _builddir="$srcdir"/build @@ -88,6 +88,6 @@ libs() { mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ } -md5sums="a8e5f5f1c1adebae7b4a654c376a6005 llvm-3.0.tar.gz -43350706ae6cf05d0068885792ea0591 clang-3.0.tar.gz -30bdaa52a057a11722093463c29bfda0 clang-3.0-alpine-linux.patch" +md5sums="16eaa7679f84113f65b12760fdfe4ee1 llvm-3.1.src.tar.gz +59bf2d3120a3805f27cafda3823caaf8 clang-3.1.src.tar.gz +6b22982046ca9a6b82bc520f407ff816 clang-3.1-alpine-linux.patch" diff --git a/main/llvm/clang-3.0-alpine-linux.patch b/main/llvm/clang-3.1-alpine-linux.patch index dedb6c2512..8214261d79 100644 --- a/main/llvm/clang-3.0-alpine-linux.patch +++ b/main/llvm/clang-3.1-alpine-linux.patch @@ -1,8 +1,26 @@ -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index eb730e5..3e4afae 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -1377,6 +1377,7 @@ Tool &AuroraUX::SelectTool(const Compilation &C, const JobAction &JA, +--- ./tools/clang/lib/Driver/ToolChains.cpp.orig ++++ ./tools/clang/lib/Driver/ToolChains.cpp +@@ -1198,7 +1198,8 @@ + "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", + "x86_64-linux-gnu", +- "x86_64-slackware-linux" ++ "x86_64-slackware-linux", ++ "x86_64-alpine-linux-uclibc" + }; + static const char *const X86LibDirs[] = { "/lib32", "/lib" }; + static const char *const X86Triples[] = { +@@ -1210,7 +1211,8 @@ + "i586-redhat-linux", + "i386-redhat-linux", + "i586-suse-linux", +- "i486-slackware-linux" ++ "i486-slackware-linux", ++ "i486-alpine-linux-uclibc" + }; + + static const char *const MIPSLibDirs[] = { "/lib" }; +@@ -1814,6 +1816,7 @@ /// Linux toolchain (very bare-bones at the moment). enum LinuxDistro { @@ -10,36 +28,16 @@ index eb730e5..3e4afae 100644 ArchLinux, DebianLenny, DebianSqueeze, -@@ -1507,6 +1508,9 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) { +@@ -1935,6 +1938,9 @@ + if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists) return ArchLinux; - ++ + if (!llvm::sys::fs::exists("/etc/alpine-release", Exists) && Exists) + return AlpineLinux; -+ + return UnknownDistro; } - -@@ -1655,7 +1659,8 @@ Linux::GCCInstallationDetector::GCCInstallationDetector(const Driver &D) - "x86_64-suse-linux", - "x86_64-manbo-linux-gnu", - "x86_64-linux-gnu", -- "x86_64-slackware-linux" -+ "x86_64-slackware-linux", -+ "x86_64-alpine-linux-uclibc" - }; - LibDirs.append(X86_64LibDirs, - X86_64LibDirs + llvm::array_lengthof(X86_64LibDirs)); -@@ -1672,7 +1677,8 @@ Linux::GCCInstallationDetector::GCCInstallationDetector(const Driver &D) - "i586-redhat-linux", - "i386-redhat-linux", - "i586-suse-linux", -- "i486-slackware-linux" -+ "i486-slackware-linux", -+ "i486-alpine-linux-uclibc" - }; - LibDirs.append(X86LibDirs, X86LibDirs + llvm::array_lengthof(X86LibDirs)); - Triples.append(X86Triples, X86Triples + llvm::array_lengthof(X86Triples)); diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp index 6151e88..d811789 100644 --- a/tools/clang/lib/Driver/Tools.cpp |