From be78d29519a138a63df55fa60fea5241778de86f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 29 Jun 2015 12:11:16 +0000
Subject: main/llvm: fix armhf triple

---
 main/llvm/APKBUILD                    | 8 ++++----
 main/llvm/llvm-0002-musl-triple.patch | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'main/llvm')

diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index b4b0f20a6a..f083601eff 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Travis Tilley <ttilley@gmail.com>
 pkgname=llvm
 pkgver=3.6.1
-pkgrel=4
+pkgrel=5
 use_svn="false"
 pkgdesc="low level virtual machine compiler system"
 arch="all"
@@ -334,7 +334,7 @@ libs() {
 }
 
 md5sums="0947294a8c83c8d7f857dfc16204c4eb  llvm-0001-fix-shared-build.patch
-d10fc3574c560ccfae3eeacdc4a988f2  llvm-0002-musl-triple.patch
+40af0cae32b49689db4ba3bb6ff4677f  llvm-0002-musl-triple.patch
 056178d87918d531f531b1b765a59e7c  llvm-0003-musl-hacks.patch
 346081b2f0825ca7f491155c4b3ca0ea  compiler-rt-0001-musl-no-dlvsym.patch
 eb3797555357896a92f74bf1bacfbdc2  compiler-rt-0002-musl-no-sanitizers.patch
@@ -356,7 +356,7 @@ ebf9e97be405ae126e134d3a357cd58a  llvm-3.6.1.src.tar.xz
 6f204b1feb324b1672ac907b32d927c0  compiler-rt-3.6.1.src.tar.xz
 be80b9c2b6d5071c71bb47d79402b9da  polly-3.6.1.src.tar.xz"
 sha256sums="4f75c2a76cf4c439d65c8e67511cd91c895edf8ccf003a5f94ffa07c29456296  llvm-0001-fix-shared-build.patch
-3062c6135b12eab1ff365d1d609193723bb4c6ff3dfa9fcf76fe2b75948668c9  llvm-0002-musl-triple.patch
+e9e533b3e285a8dbabc8145526128f74dd67db0fdbab219169fa7c7a733c4b2a  llvm-0002-musl-triple.patch
 c6892c843b38c9a852367e5d76ffc29c21bdfd522adbc4c4e3e3c890a513c0db  llvm-0003-musl-hacks.patch
 94f5626b4729afb39ad00a6cac4f8d44e3ee6f3d87362268bcd2c0ec637edc22  compiler-rt-0001-musl-no-dlvsym.patch
 7dd2d22c61892eb651809649606fb3722520a5d12f8d88c2e96be977d0f8b71a  compiler-rt-0002-musl-no-sanitizers.patch
@@ -378,7 +378,7 @@ f4ee70d870d550a9147ac6a548ce7daf7d9e6897348bf411f43c572966fb92b6  clang-tools-ex
 fcbf610c77be6047f11ca10c4725610417beba832565115a9e2fcfe2897b649f  compiler-rt-3.6.1.src.tar.xz
 d085f97bcbb4e47b51ed60ba9a55b3fee394193e7e48ab5c5b0035e6fc80a7eb  polly-3.6.1.src.tar.xz"
 sha512sums="b3c0e0f74680e9b2d02f1c923a191ef5eb913be84105e4d63aae6a88b1dac758467cecad3430496a7945cebdc73ec5ee1f643dc5dc7b336fee920e3c8b6d54d2  llvm-0001-fix-shared-build.patch
-8088e79c51694d237f0e29a1c9032776f943561aff389f8706f1c10b3b0405d4fa72643fb83c973be55370e89d893f7b7592bb8c64dcf2310369c0d1b7ba5db2  llvm-0002-musl-triple.patch
+0029c8ced95f7e48b466aa5e87cb8002928face0d4db888f7f922781e8dd2bf5737206dcdec58f5989572e487fd76b2ec5883ef5551539f3ebc14c8e76ac2cce  llvm-0002-musl-triple.patch
 df8959d43af48054bc35e4125f98e5dab1e1b5beaf7b67e95791caf144efec06764bd31a9eb5efc2179932591de8b862ebf89592d131e47070c89f19412979b7  llvm-0003-musl-hacks.patch
 f1e6d17f4cc618b6a1edba64bda652f210d3c839bd8d2d4eff81af0895176062dab1e8fa963d0fe2403311863aee083d257bdb57ad9b44e23a958286a0d2e12b  compiler-rt-0001-musl-no-dlvsym.patch
 45f64cd5863238b7f7ad2f4a3733455e17eb3ab3121ba3404404f312beb91bb4d109c7c3278f77fc78730086e70cfe6532e159efef30e34af0132ca44a965220  compiler-rt-0002-musl-no-sanitizers.patch
diff --git a/main/llvm/llvm-0002-musl-triple.patch b/main/llvm/llvm-0002-musl-triple.patch
index f6f186e70c..aba274a7b7 100644
--- a/main/llvm/llvm-0002-musl-triple.patch
+++ b/main/llvm/llvm-0002-musl-triple.patch
@@ -22,8 +22,8 @@ index 0838e90..4be78e5 100644
    case EABI: return "eabi";
    case EABIHF: return "eabihf";
 +  case Musl: return "musl";
-+  case MuslEABIHF: return "musleabihf";
-+  case MuslEABI: return "musleabi";
++  case MuslEABIHF: return "muslgnueabihf";
++  case MuslEABI: return "muslgnueabi";
    case Android: return "android";
    case MSVC: return "msvc";
    case Itanium: return "itanium";
@@ -31,8 +31,8 @@ index 0838e90..4be78e5 100644
      .StartsWith("code16", Triple::CODE16)
      .StartsWith("gnu", Triple::GNU)
      .StartsWith("android", Triple::Android)
-+    .StartsWith("musleabihf", Triple::MuslEABIHF)
-+    .StartsWith("musleabi", Triple::MuslEABI)
++    .StartsWith("muslgnueabihf", Triple::MuslEABIHF)
++    .StartsWith("muslgnueabi", Triple::MuslEABI)
 +    .StartsWith("musl", Triple::Musl)
      .StartsWith("msvc", Triple::MSVC)
      .StartsWith("itanium", Triple::Itanium)
-- 
cgit v1.2.3