Skip to content

Commit ce2cdc6

Browse files
shahmishalshahmishal
authored
Merge pull request swiftlang#80 from apple/test-swift-5.6
Update the RPM spec files to support release/5.6
2 parents 6fded1b + 1fc5473 commit ce2cdc6

File tree

10 files changed

+350
-189
lines changed

10 files changed

+350
-189
lines changed

Diff for: ‎platforms/Linux/RPM/Amazonlinux/2/patches/swift-api-checker.patch

-9
This file was deleted.

Diff for: ‎platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec

+34-10
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,26 @@ Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_a
2626
Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz
2727
Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz
2828
Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz
29-
Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz
29+
Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz
3030
Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz
3131
Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz
3232
Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz
33-
34-
Patch0: patches/swift-api-checker.patch
35-
Patch1: patches/hwasan_symbolize.patch
33+
Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz
34+
Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz
35+
Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz
36+
Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz
37+
Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz
38+
Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz
39+
Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz
40+
Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz
41+
Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz
42+
Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz
43+
Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
44+
Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
45+
Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
46+
47+
48+
Patch0: patches/hwasan_symbolize.patch
3649

3750
BuildRequires: clang
3851
BuildRequires: curl-devel
@@ -92,7 +105,8 @@ importantly, Swift is designed to make writing and maintaining
92105
correct programs easier for the developer.
93106

94107
%prep
95-
%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20
108+
%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
109+
96110
# The Swift build script requires directories to be named
97111
# in a specific way so renaming the source directories is
98112
# necessary
@@ -115,24 +129,34 @@ mv swift-driver-swift-%{swift_version} swift-driver
115129
mv swift-crypto-%{swift_crypto_version} swift-crypto
116130
mv ninja-%{ninja_version} ninja
117131
mv CMake-%{cmake_version} cmake
132+
mv swift-atomics-%{swift_atomics_version} swift-atomics
133+
mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm
134+
mv swift-docc-swift-%{swift_version} swift-docc
135+
mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact
136+
mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit
137+
mv swift-collections-%{swift_collections_version} swift-collections
138+
mv swift-numerics-%{swift_numerics_version} swift-numerics
139+
mv swift-system-%{swift_system_version} swift-system
140+
mv swift-nio-%{swift_nio_version} swift-nio
141+
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
142+
mv swift-format-swift-%{swift_version} swift-format
143+
mv swift-lmdb-swift-%{swift_version} swift-lmdb
144+
mv swift-markdown-swift-%{swift_version} swift-markdown
118145

119146
# ICU
120147
mv icu-release-%{icu_version} icu
121148

122149
# Yams
123150
mv Yams-%{yams_version} yams
124151

125-
# Adjust python version swift-api-checker
126-
%patch0 -p1
127-
128152
# Adjust python version hwasan_symbolize
129-
%patch1 -p1
153+
%patch0 -p1
130154

131155
%build
132156
export VERBOSE=1
133157

134158
# Run the build
135-
swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-amazonlinux2.tar.gz
159+
swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-amazonlinux2.tar.gz
136160

137161
%install
138162
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}

Diff for: ‎platforms/Linux/RPM/Centos/7/patches/swift-api-checker.patch

-9
This file was deleted.

Diff for: ‎platforms/Linux/RPM/Centos/7/swiftlang.spec

+34-10
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,26 @@ Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_a
2626
Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz
2727
Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz
2828
Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz
29-
Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz
29+
Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz
3030
Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz
3131
Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz
3232
Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz
33-
34-
Patch0: patches/swift-api-checker.patch
35-
Patch1: patches/hwasan_symbolize.patch
33+
Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz
34+
Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz
35+
Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz
36+
Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz
37+
Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz
38+
Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz
39+
Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz
40+
Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz
41+
Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz
42+
Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz
43+
Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
44+
Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
45+
Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
46+
47+
48+
Patch0: patches/hwasan_symbolize.patch
3649

3750
BuildRequires: autoconf
3851
BuildRequires: devtoolset-8
@@ -92,7 +105,8 @@ importantly, Swift is designed to make writing and maintaining
92105
correct programs easier for the developer.
93106

94107
%prep
95-
%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20
108+
%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
109+
96110
# The Swift build script requires directories to be named
97111
# in a specific way so renaming the source directories is
98112
# necessary
@@ -115,24 +129,34 @@ mv swift-driver-swift-%{swift_version} swift-driver
115129
mv swift-crypto-%{swift_crypto_version} swift-crypto
116130
mv ninja-%{ninja_version} ninja
117131
mv CMake-%{cmake_version} cmake
132+
mv swift-atomics-%{swift_atomics_version} swift-atomics
133+
mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm
134+
mv swift-docc-swift-%{swift_version} swift-docc
135+
mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact
136+
mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit
137+
mv swift-collections-%{swift_collections_version} swift-collections
138+
mv swift-numerics-%{swift_numerics_version} swift-numerics
139+
mv swift-system-%{swift_system_version} swift-system
140+
mv swift-nio-%{swift_nio_version} swift-nio
141+
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
142+
mv swift-format-swift-%{swift_version} swift-format
143+
mv swift-lmdb-swift-%{swift_version} swift-lmdb
144+
mv swift-markdown-swift-%{swift_version} swift-markdown
118145

119146
# ICU
120147
mv icu-release-%{icu_version} icu
121148

122149
# Yams
123150
mv Yams-%{yams_version} yams
124151

125-
# Adjust python version swift-api-checker
126-
%patch0 -p1
127-
128152
# Adjust python version hwasan_symbolize
129-
%patch1 -p1
153+
%patch0 -p1
130154

131155
%build
132156
export VERBOSE=1
133157

134158
# Run the build
135-
swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos7.tar.gz
159+
swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos7.tar.gz
136160

137161
%install
138162
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}

Diff for: ‎platforms/Linux/RPM/Centos/8/patches/swift-api-checker.patch

-9
This file was deleted.

Diff for: ‎platforms/Linux/RPM/Centos/8/swiftlang.spec

+33-10
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,25 @@ Source13: https://github.com/apple/swift-argument-parser/archive/%{swift_a
2626
Source14: https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz
2727
Source15: https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz
2828
Source16: https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz
29-
Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz
29+
Source17: https://github.com/jpsim/Yams/archive/%{yams_version}.tar.gz#/yams.tar.gz
3030
Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz
3131
Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz
3232
Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz
33-
34-
Patch0: patches/swift-api-checker.patch
35-
Patch1: patches/hwasan_symbolize.patch
33+
Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz
34+
Source22: https://github.com/apple/swift-cmark/archive/swift-%{swift_version}-gfm.tar.gz#/swift-cmark-gfm.tar.gz
35+
Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz
36+
Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz
37+
Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz
38+
Source26: https://github.com/apple/swift-collections/archive/%{swift_collections_version}.tar.gz#/swift-collections.tar.gz
39+
Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics_version}.tar.gz#/swift-numerics.tar.gz
40+
Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz
41+
Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz
42+
Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz
43+
Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
44+
Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
45+
Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
46+
47+
Patch0: patches/hwasan_symbolize.patch
3648

3749
BuildRequires: autoconf
3850
BuildRequires: clang
@@ -91,7 +103,8 @@ importantly, Swift is designed to make writing and maintaining
91103
correct programs easier for the developer.
92104

93105
%prep
94-
%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20
106+
%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
107+
95108
# The Swift build script requires directories to be named
96109
# in a specific way so renaming the source directories is
97110
# necessary
@@ -114,18 +127,28 @@ mv swift-driver-swift-%{swift_version} swift-driver
114127
mv swift-crypto-%{swift_crypto_version} swift-crypto
115128
mv ninja-%{ninja_version} ninja
116129
mv CMake-%{cmake_version} cmake
130+
mv swift-atomics-%{swift_atomics_version} swift-atomics
131+
mv swift-cmark-swift-%{swift_version}-gfm swift-cmark-gfm
132+
mv swift-docc-swift-%{swift_version} swift-docc
133+
mv swift-docc-render-artifact-swift-%{swift_version} swift-docc-render-artifact
134+
mv swift-docc-symbolkit-swift-%{swift_version} swift-docc-symbolkit
135+
mv swift-collections-%{swift_collections_version} swift-collections
136+
mv swift-numerics-%{swift_numerics_version} swift-numerics
137+
mv swift-system-%{swift_system_version} swift-system
138+
mv swift-nio-%{swift_nio_version} swift-nio
139+
mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl
140+
mv swift-format-swift-%{swift_version} swift-format
141+
mv swift-lmdb-swift-%{swift_version} swift-lmdb
142+
mv swift-markdown-swift-%{swift_version} swift-markdown
117143

118144
# ICU
119145
mv icu-release-%{icu_version} icu
120146

121147
# Yams
122148
mv Yams-%{yams_version} yams
123149

124-
# Adjust python version swift-api-checker
125-
%patch0 -p1
126-
127150
# Adjust python version hwasan_symbolize
128-
%patch1 -p1
151+
%patch0 -p1
129152

130153
# Fix python to python3
131154
ln -s /usr/bin/python3 /usr/bin/python
@@ -134,7 +157,7 @@ ln -s /usr/bin/python3 /usr/bin/python
134157
export VERBOSE=1
135158

136159
# Run the build
137-
swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos8.tar.gz
160+
swift/utils/build-script --preset=buildbot_linux,no_assertions,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos8.tar.gz
138161

139162
%install
140163
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}

0 commit comments

Comments
 (0)