summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoloturn2020-10-07 18:19:29 +0200
committersoloturn2020-10-07 18:19:29 +0200
commit9e8a73d53b39de1c1a751528926afe4b2d597206 (patch)
tree886229b279cbab478a72c3d3f5f624be8937685a
parentf7847714c36fbe7e6ea840a2bfaf8fbf8b138250 (diff)
downloadaur-9e8a73d53b39de1c1a751528926afe4b2d597206.tar.gz
install prefix /usr/lib/swift-git
-rw-r--r--0001-arch-aur-pachtes.patch14
-rw-r--r--PKGBUILD2
2 files changed, 9 insertions, 7 deletions
diff --git a/0001-arch-aur-pachtes.patch b/0001-arch-aur-pachtes.patch
index c6cf6c0ee552..768b455b02f4 100644
--- a/0001-arch-aur-pachtes.patch
+++ b/0001-arch-aur-pachtes.patch
@@ -1,14 +1,14 @@
-From a5582eb180b2568a6d52e15d2e83f0ebd23330bc Mon Sep 17 00:00:00 2001
+From cb1d8f4bbca9c91c3c37a43553ee236a2370ffea Mon Sep 17 00:00:00 2001
From: soloturn <soloturn@gmail.com>
Date: Sat, 1 Aug 2020 16:21:07 +0200
Subject: [PATCH] arch aur pachtes
---
- utils/build-presets.ini | 4 ----
- 1 file changed, 4 deletions(-)
+ utils/build-presets.ini | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
-index 7d9a5c264c8..5e6c207842a 100644
+index 7d9a5c264c8..69d17512110 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -783,12 +783,10 @@ llbuild
@@ -24,14 +24,16 @@ index 7d9a5c264c8..5e6c207842a 100644
install-llvm
install-swift
install-lldb
-@@ -796,7 +794,6 @@ install-llbuild
+@@ -796,8 +794,7 @@ install-llbuild
install-swiftpm
install-swift-driver
install-xctest
-install-libicu
- install-prefix=/usr
+-install-prefix=/usr
++install-prefix=/usr/lib/swift-git
install-libcxx
install-sourcekit-lsp
+ build-swift-static-stdlib
@@ -816,7 +813,6 @@ toolchain-benchmarks
install-destdir=%(install_destdir)s
diff --git a/PKGBUILD b/PKGBUILD
index af23b25936fc..de1638275c76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -94,7 +94,7 @@ build() {
# Which will break `compiler-rt`
unset CPPFLAGS
- C_CXX_LAUNCHER="$(which sccache)" SCCACHE_DIR=${srcdir}/sccache python swift/utils/build-script --preset=buildbot_linux,no_test install_prefix="/usr/lib/swift-git" install_destdir="$pkgdir" cmake_c_launcher="$(which sccache)" cmake_cxx_launcher="$(which sccache)"
+ C_CXX_LAUNCHER="$(which sccache)" SCCACHE_DIR=${srcdir}/sccache python swift/utils/build-script --preset=buildbot_linux,no_test install_destdir="$pkgdir" cmake_c_launcher="$(which sccache)" cmake_cxx_launcher="$(which sccache)"
}
package() {