Skip to content

Commit 53a1dd9

Browse files
shahmishalshahmishal
authored
Merge pull request swiftlang#133 from apple/shahmishal/bump-the-version-rpm
Update the version to Swift 5.6.2
2 parents d43de5f + 556d2bc commit 53a1dd9

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎platforms/Linux/DEB/Shared/versions.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh
22

3-
debversion=5.6.0
3+
debversion=5.6.2
44

5-
swift_version=5.6-RELEASE
5+
swift_version=5.6.2-RELEASE
66
icu_version=65-1
77
yams_version=4.0.2
88
swift_argument_parser_version=1.0.3

‎platforms/Linux/DEB/Ubuntu/focal/debian/patches/build-preset-install-dir

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Description: Make target installation directory a command line option
33
time on the command line.
44
Author: Julien Blache <[email protected]>
55

6-
Index: swiftlang-5.6.0/swift/utils/build-presets.ini
6+
Index: swiftlang-5.6.2/swift/utils/build-presets.ini
77
===================================================================
8-
--- swiftlang-5.6.0.orig/swift/utils/build-presets.ini
9-
+++ swiftlang-5.6.0/swift/utils/build-presets.ini
8+
--- swiftlang-5.6.2.orig/swift/utils/build-presets.ini
9+
+++ swiftlang-5.6.2/swift/utils/build-presets.ini
1010
@@ -831,7 +831,7 @@ install-swiftpm
1111
install-swift-driver
1212
install-xctest

‎platforms/Linux/DEB/Ubuntu/focal/debian/patches/cmake_parallel_bootstrap

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Description: Enable parallel boostrap for CMake
22
CMake's bootstrap can be parallelized, but wasn't.
33
Author: Julien Blache <[email protected]>
44

5-
Index: swiftlang-5.6.0/swift/utils/swift_build_support/swift_build_support/cmake.py
5+
Index: swiftlang-5.6.2/swift/utils/swift_build_support/swift_build_support/cmake.py
66
===================================================================
7-
--- swiftlang-5.6.0.orig/swift/utils/swift_build_support/swift_build_support/cmake.py
8-
+++ swiftlang-5.6.0/swift/utils/swift_build_support/swift_build_support/cmake.py
7+
--- swiftlang-5.6.2.orig/swift/utils/swift_build_support/swift_build_support/cmake.py
8+
+++ swiftlang-5.6.2/swift/utils/swift_build_support/swift_build_support/cmake.py
99
@@ -267,8 +267,10 @@ class CMake(object):
1010

1111
cwd = os.getcwd()

‎platforms/Linux/DEB/Ubuntu/focal/debian/patches/fix-integration-tests-package-path

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Description: Fix integration tests to use correct package path
33
the tests.
44
Author: Julien Blache <[email protected]>
55

6-
Index: swiftlang-5.6.0/swift-integration-tests/lit.cfg
6+
Index: swiftlang-5.6.2/swift-integration-tests/lit.cfg
77
===================================================================
8-
--- swiftlang-5.6.0.orig/swift-integration-tests/lit.cfg
9-
+++ swiftlang-5.6.0/swift-integration-tests/lit.cfg
8+
--- swiftlang-5.6.2.orig/swift-integration-tests/lit.cfg
9+
+++ swiftlang-5.6.2/swift-integration-tests/lit.cfg
1010
@@ -175,31 +175,31 @@ else:
1111

1212
swift_path = lit_config.params.get(
@@ -45,10 +45,10 @@ Index: swiftlang-5.6.0/swift-integration-tests/lit.cfg
4545
lit_config.note("testing using 'docc': {}".format(docc_path))
4646

4747
# Verify they exist.
48-
Index: swiftlang-5.6.0/swift-integration-tests/test-snapshot-binaries/test-rpath-linux.py
48+
Index: swiftlang-5.6.2/swift-integration-tests/test-snapshot-binaries/test-rpath-linux.py
4949
===================================================================
50-
--- swiftlang-5.6.0.orig/swift-integration-tests/test-snapshot-binaries/test-rpath-linux.py
51-
+++ swiftlang-5.6.0/swift-integration-tests/test-snapshot-binaries/test-rpath-linux.py
50+
--- swiftlang-5.6.2.orig/swift-integration-tests/test-snapshot-binaries/test-rpath-linux.py
51+
+++ swiftlang-5.6.2/swift-integration-tests/test-snapshot-binaries/test-rpath-linux.py
5252
@@ -4,26 +4,26 @@
5353
# CHECK: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}$ORIGIN/../lib/swift/linux
5454
#
@@ -84,10 +84,10 @@ Index: swiftlang-5.6.0/swift-integration-tests/test-snapshot-binaries/test-rpath
8484
-# RUN: %{readelf} -d %{package_path}/usr/lib/libswiftDemangle.so | %{FileCheck} --check-prefix CHECK-SDE %s
8585
+# RUN: %{readelf} -d %{package_path}/lib/libswiftDemangle.so | %{FileCheck} --check-prefix CHECK-SDE %s
8686
# CHECK-SDE-NOT: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}:/usr/lib/swift/linux
87-
Index: swiftlang-5.6.0/swift/utils/build-script-impl
87+
Index: swiftlang-5.6.2/swift/utils/build-script-impl
8888
===================================================================
89-
--- swiftlang-5.6.0.orig/swift/utils/build-script-impl
90-
+++ swiftlang-5.6.0/swift/utils/build-script-impl
89+
--- swiftlang-5.6.2.orig/swift/utils/build-script-impl
90+
+++ swiftlang-5.6.2/swift/utils/build-script-impl
9191
@@ -3463,8 +3463,10 @@ function build_and_test_installable_pack
9292

9393
if [[ "${host}" == "macosx-"* ]] || [[ "${host}" == "merged-hosts" ]]; then

‎platforms/Linux/DEB/Ubuntu/focal/debian/patches/fix-toolchain-path

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Description: Fix toolchain path for build-script-helper.py
33
assumption that /usr is used.
44
Author: Julien Blache <[email protected]>
55

6-
Index: swiftlang-5.6.0/swift/benchmark/scripts/build_script_helper.py
6+
Index: swiftlang-5.6.2/swift/benchmark/scripts/build_script_helper.py
77
===================================================================
8-
--- swiftlang-5.6.0.orig/swift/benchmark/scripts/build_script_helper.py
9-
+++ swiftlang-5.6.0/swift/benchmark/scripts/build_script_helper.py
8+
--- swiftlang-5.6.2.orig/swift/benchmark/scripts/build_script_helper.py
9+
+++ swiftlang-5.6.2/swift/benchmark/scripts/build_script_helper.py
1010
@@ -53,7 +53,7 @@ def main():
1111
if not os.path.isdir(bin_dir):
1212
os.makedirs(bin_dir)
@@ -16,10 +16,10 @@ Index: swiftlang-5.6.0/swift/benchmark/scripts/build_script_helper.py
1616
perform_build(args, swiftbuild_path, "debug", "Benchmark_Onone", "-Onone")
1717
perform_build(args, swiftbuild_path, "release", "Benchmark_Osize", "-Osize")
1818
perform_build(args, swiftbuild_path, "release", "Benchmark_O", "-O")
19-
Index: swiftlang-5.6.0/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py
19+
Index: swiftlang-5.6.2/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py
2020
===================================================================
21-
--- swiftlang-5.6.0.orig/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py
22-
+++ swiftlang-5.6.0/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py
21+
--- swiftlang-5.6.2.orig/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py
22+
+++ swiftlang-5.6.2/swift/utils/swift_build_support/swift_build_support/products/benchmarks.py
2323
@@ -100,13 +100,17 @@ class Benchmarks(product.Product):
2424

2525

‎platforms/Linux/DEB/Ubuntu/focal/debian/patches/python3_hwasan_symbolize

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Description: Fix hwasan_symbolize to call python3
22
On Ubuntu, /usr/bin/python is still python 2.x.
33
Author: Julien Blache <[email protected]>
44

5-
Index: swiftlang-5.6.0/llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
5+
Index: swiftlang-5.6.2/llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
66
===================================================================
7-
--- swiftlang-5.6.0.orig/llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
8-
+++ swiftlang-5.6.0/llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
7+
--- swiftlang-5.6.2.orig/llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
8+
+++ swiftlang-5.6.2/llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
99
@@ -1,4 +1,4 @@
1010
-#!/usr/bin/env python
1111
+#!/usr/bin/env python3

‎platforms/Linux/RPM/Shared/metadata/global.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# versions
22

3-
%global package_version 5.6.0
4-
%global swift_version 5.6-RELEASE
3+
%global package_version 5.6.2
4+
%global swift_version 5.6.2-RELEASE
55

66
%global cmake_version 3.19.6
77
%global icu_version 65-1

0 commit comments

Comments
 (0)