summarylogtreecommitdiffstats
path: root/0001-arch-aur-patches.patch
blob: f32f57e766abd98edd9fad5f9783d393d2594970 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
From b79f0992a2201a2864dfde89291b3e1504613bea Mon Sep 17 00:00:00 2001
From: soloturn <soloturn@gmail.com>
Date: Sun, 20 Mar 2022 12:05:07 +0100
Subject: [PATCH] arch aur patches

---
 utils/build-presets.ini | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 57518c0853d..e959488e23e 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -822,10 +822,8 @@ llbuild
 swiftpm
 swift-driver
 xctest
-libicu
 swiftdocc
 
-build-ninja
 install-llvm
 install-swift
 install-lldb
@@ -833,8 +831,7 @@ install-llbuild
 install-swiftpm
 install-swift-driver
 install-xctest
-install-libicu
-install-prefix=/usr
+install-prefix=/usr/lib/swift
 install-sourcekit-lsp
 install-swiftdocc
 build-swift-static-stdlib
@@ -847,13 +844,13 @@ build-swift-stdlib-unittest-extra
 test-installable-package
 
 # Build the benchmarks against the toolchain.
-toolchain-benchmarks
+# does not work outside /usr, Build the benchmarks against the toolchain.
+# toolchain-benchmarks
 
 # Path to the root of the installation filesystem.
 install-destdir=%(install_destdir)s
 
 # Path to the .tar.gz package we would create.
-installable-package=%(installable_package)s
 
 # This ensures the default module cache
 # location is local to this run, allowing
@@ -1102,7 +1099,6 @@ mixin-preset=
     mixin_linux_install_components_with_clang
 build-subdir=buildbot_incremental
 
-libicu
 llbuild
 swiftpm
 swift-driver
@@ -1116,7 +1112,6 @@ sourcekit-lsp
 install-llvm
 install-swift
 install-llbuild
-install-libicu
 install-swiftpm
 install-swift-driver
 install-foundation
@@ -1671,12 +1666,10 @@ mixin-preset=
     mixin_linux_install_components_with_clang
 
 libdispatch
-libicu
 foundation
 xctest
 libcxx=false
 
-install-libicu
 install-foundation
 install-libdispatch
 install-xctest
@@ -1918,7 +1911,6 @@ mixin-preset=buildbot_indexstoredb_linux,sanitize
 mixin-preset=
     mixin_linux_install_components_with_clang
 
-libicu
 llbuild
 swiftpm
 xctest
@@ -1933,7 +1925,6 @@ reconfigure
 
 install-foundation
 install-libdispatch
-install-libicu
 install-libcxx
 install-llvm
 install-swift
@@ -2687,7 +2678,6 @@ no-assertions
 [preset: linux_lldb]
 lldb
 foundation
-libicu
 libdispatch
 build-ninja
 
-- 
2.35.1