summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hansen2017-04-09 18:56:30 -0700
committerMichael Hansen2017-04-09 18:56:30 -0700
commit3681a898ea032da139a78b8168e11ceaaf7bd6c4 (patch)
treeb6ce65243be14e121e73b13d2ea9cbdb9846ac6d
parente3d05ca1adba3f905d2c15b48dced14854d15bc5 (diff)
downloadaur-3681a898ea032da139a78b8168e11ceaaf7bd6c4.tar.gz
Fix a couple of build issues (missing rsync, wrong python)
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 982b5e1edfa4..7119f902bc99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Apr 7 05:29:48 UTC 2017
+# Mon Apr 10 01:56:07 UTC 2017
pkgbase = swift-language
pkgdesc = The Swift programming language and debugger
pkgver = 3.1
@@ -17,6 +17,7 @@ pkgbase = swift-language
makedepends = perl
makedepends = python2-sphinx
makedepends = python2-requests
+ makedepends = rsync
depends = python2
depends = libutil-linux
depends = icu
diff --git a/PKGBUILD b/PKGBUILD
index 08ff85e6bae8..e86e7cc6cdab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ license=('apache')
depends=('python2' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
'sqlite' 'ncurses' 'libkqueue' 'libblocksruntime')
makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.8' 'python2-six' 'perl'
- 'python2-sphinx' 'python2-requests')
+ 'python2-sphinx' 'python2-requests' 'rsync')
source=(
"swift-${_swiftver}.tar.gz::https://github.com/apple/swift/archive/swift-${_swiftver}.tar.gz"
@@ -52,7 +52,8 @@ prepare() {
sed -i '/^cmake_minimum_required/a set(Python_ADDITIONAL_VERSIONS 2.7)' \
"$srcdir/swift-lldb-swift-${_swiftver}/CMakeLists.txt"
sed -i 's/\<python\>/&2/' \
- "$srcdir/swift-swift-${_swiftver}/utils/build-script-impl"
+ "$srcdir/swift-swift-${_swiftver}/utils/build-script-impl" \
+ "$srcdir/swift-swift-${_swiftver}/test/sil-passpipeline-dump/basic.test-sh"
# Use directory names which build-script expects
for sdir in llvm clang lldb cmark llbuild; do