Backport fix for xar 1.6.1+

3 files changed, 47 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 591481387c9c..750a993c2564 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 13 21:21:34 UTC 2016
+# Thu Sep 15 16:15:30 UTC 2016
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
 	pkgver = 3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://swift.org/
 	arch = i686
 	arch = x86_64
@@ -37,6 +37,7 @@ pkgbase = swift-language
 	source = swift-corelibs-libdispatch-3.0-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-3.0-RELEASE.tar.gz
 	source = swift-integration-tests-3.0-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-3.0-RELEASE.tar.gz
 	source = swift-sphinx2.patch
+	source = xar-1.6.patch
 	sha256sums = a278ca9ef489fbab00dc9864a2ac1bd84c8324bba7463ce7e3797debaf8cee84
 	sha256sums = 30bff4c69fae90a6b3aeb7fef14681c1e291fd57cf695d330adb095eac2718e6
 	sha256sums = 75027d876a58c42200d2439c2f0e3aa569a98d2c245f609eab0c5d32a6514db4
@@ -49,6 +50,7 @@ pkgbase = swift-language
 	sha256sums = 7f2554a218b6571a7d7e15a7101139cd6e672334d18e07b13b20a5d6caf6df52
 	sha256sums = 2a2072d52c4c361bd946136ccc8db4fbf1d0944f40b67d14a2b1e2ebf4f36709
 	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
+	sha256sums = df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index a1f20d8b93a8..328225f77d47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ pkgbase=swift-language
 pkgname=(swift swift-lldb)
 _swiftver=3.0-RELEASE
 pkgver=${_swiftver//-RELEASE/}
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swift programming language and debugger"
 arch=('i686' 'x86_64')
 url="http://swift.org/"
@@ -24,7 +24,7 @@ source=(
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-libdispatch-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
-    "swift-sphinx2.patch"
+    "swift-sphinx2.patch" "xar-1.6.patch"
 )
 sha256sums=('a278ca9ef489fbab00dc9864a2ac1bd84c8324bba7463ce7e3797debaf8cee84'
             '30bff4c69fae90a6b3aeb7fef14681c1e291fd57cf695d330adb095eac2718e6'
@@ -37,7 +37,8 @@ sha256sums=('a278ca9ef489fbab00dc9864a2ac1bd84c8324bba7463ce7e3797debaf8cee84'
             '391bd525be98396efcf7845dc88be676db585ead77a823df93fd4f1feea75b1a'
             '7f2554a218b6571a7d7e15a7101139cd6e672334d18e07b13b20a5d6caf6df52'
             '2a2072d52c4c361bd946136ccc8db4fbf1d0944f40b67d14a2b1e2ebf4f36709'
-            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f')
+            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f'
+            'df27c2bfeaed6335f49a8815b0b296fd5acc331a6a9361a40f7dfc69a7518da6')
 
 prepare() {
     # Use python2 where appropriate
@@ -67,6 +68,9 @@ prepare() {
     # Sphinx 1.3.5 raises a warning (promoted to error) when using an unknown
     # syntax highlighting language (like "swift").
     ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-sphinx2.patch" )
+
+    # Fix for xar 1.6.1+ (backported from LLVM trunk)
+    ( cd "${srcdir}/llvm" && patch -p1 -i "${srcdir}/xar-1.6.patch" )
 }
 
 build() {
diff --git a/xar-1.6.patch b/xar-1.6.patch
new file mode 100644
index 000000000000..21738871ae44
--- /dev/null
+++ b/xar-1.6.patch
@@ -0,0 +1,36 @@
+From f0a99b9f6860044e045b874549928c148087b626 Mon Sep 17 00:00:00 2001
+From: Kevin Enderby <enderby@apple.com>
+Date: Mon, 23 May 2016 22:18:59 +0000
+Subject: [PATCH] Tweak to change in r270491 to deal with the
+ lld-x86_64-darwin13 bot having a old xar.h header. Reviewed the change with
+ Chris Bieneman and Pete Cooper.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@270502 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ tools/llvm-objdump/MachODump.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
+index 2bafe55..b97cdca 100644
+--- a/tools/llvm-objdump/MachODump.cpp
++++ b/tools/llvm-objdump/MachODump.cpp
+@@ -5873,12 +5873,16 @@ static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
+       case XAR_CKSUM_MD5:
+         outs() << "XAR_CKSUM_MD5\n";
+         break;
++#ifdef XAR_CKSUM_SHA256
+       case XAR_CKSUM_SHA256:
+         outs() << "XAR_CKSUM_SHA256\n";
+         break;
++#endif
++#ifdef XAR_CKSUM_SHA512
+       case XAR_CKSUM_SHA512:
+         outs() << "XAR_CKSUM_SHA512\n";
+         break;
++#endif
+       default:
+         outs() << XarHeader.cksum_alg << "\n";
+     }
+-- 
+2.7.4
+