summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoloturn2020-09-15 03:12:09 +0200
committersoloturn2020-09-15 03:12:09 +0200
commit4c6714625e5be9a6558b88e1f217c3d9b346d3e2 (patch)
treed2433da25f1287b5f1721abcd13a2cd17d555ddc
parent59e25e1c183af206ba42eb600050f3a63faa0b52 (diff)
downloadaur-4c6714625e5be9a6558b88e1f217c3d9b346d3e2.tar.gz
llbuild ninja test binary links against ncurses
-rw-r--r--0002-llbuild-ninja-test-binary-links-against-ncurses.patch25
-rw-r--r--PKGBUILD5
2 files changed, 29 insertions, 1 deletions
diff --git a/0002-llbuild-ninja-test-binary-links-against-ncurses.patch b/0002-llbuild-ninja-test-binary-links-against-ncurses.patch
new file mode 100644
index 000000000000..6ff3f16ce0ca
--- /dev/null
+++ b/0002-llbuild-ninja-test-binary-links-against-ncurses.patch
@@ -0,0 +1,25 @@
+From bc82c7d063aff71d09e9a0cef4e059c278459f47 Mon Sep 17 00:00:00 2001
+From: soloturn <soloturn@gmail.com>
+Date: Tue, 15 Sep 2020 02:53:24 +0200
+Subject: [PATCH] llbuild ninja test binary links against ncurses
+
+llbuild ninja test binary needs to link against ncurses:
+https://github.com/apple/swift-llbuild/blob/a9f4b75cf7288156ed1880f98cebe17da1543a38/Package.swift#L207
+---
+ lib/llvm/Support/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/llvm/Support/CMakeLists.txt b/lib/llvm/Support/CMakeLists.txt
+index 5871d60a..9d5a714b 100644
+--- a/lib/llvm/Support/CMakeLists.txt
++++ b/lib/llvm/Support/CMakeLists.txt
+@@ -64,3 +64,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ execinfo)
+ endif()
+
++if(${CMAKE_SYSTEM_NAME} MATCHES "Android|Darwin|Linux")
++ target_link_libraries(llvmSupport PRIVATE curses)
++endif()
+--
+2.28.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 5f975188226f..acde96cc2d5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: soloturn@gmail.com
pkgname=swift-language-git
-pkgver=swift.DEVELOPMENT.SNAPSHOT.2020.09.11.a.r71.ge6f7b9dc8e8
+pkgver=swift.DEVELOPMENT.SNAPSHOT.2020.09.11.a.r74.gc56ae1e3364
pkgrel=1
pkgdesc="The Swift programming language, taken directly from the Apple repository"
arch=('x86_64')
@@ -37,6 +37,7 @@ source=(
'llvm-project::git+https://github.com/apple/llvm-project#branch=swift/master'
# 'llvm-project::git+https://github.com/apple/llvm-project#commit=e80a6b097761253'
'0001-arch-aur-pachtes.patch'
+ '0002-llbuild-ninja-test-binary-links-against-ncurses.patch'
)
noextract=()
md5sums=(
@@ -55,6 +56,7 @@ md5sums=(
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
)
@@ -65,6 +67,7 @@ md5sums=(
prepare () {
( cd swift && patch -p1 -i "$srcdir/0001-arch-aur-pachtes.patch" )
+ ( cd llbuild && patch -p1 -i "$srcdir/0002-llbuild-ninja-test-binary-links-against-ncurses.patch" )
}
pkgver() {