The package rpms/swift-lang.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/swift-lang.git/commit/?id=549d849ca9....
Change: -%ifnarch s390x
Thanks.
Full change: ============
commit 549d849ca9943758e5f8caf8ae15069b9a4d1ac9 Author: Ron Olson tachoknight@gmail.com Date: Sat May 1 13:53:33 2021 -0500
Updated to Swift 5.4-RELEASE
diff --git a/.gitignore b/.gitignore index ff06e18..2bf6ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ /cmake-3.16.5.tar.gz /release-67-1.tar.gz /release-68-2.tar.gz +/0.3.0.tar.gz +/3.0.1.zip +/cmake-3.19.3.tar.gz +/swift-driver.tar.gz +/swift-tools-support-core.tar.gz diff --git a/build-setup-s390x.patch b/build-setup-s390x.patch deleted file mode 100644 index 83a723b..0000000 --- a/build-setup-s390x.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- swift/utils/build-presets.ini.orig 2020-04-11 22:32:29.178121900 +0000 -+++ swift/utils/build-presets.ini 2020-04-11 22:33:41.148121900 +0000 -@@ -736,18 +736,15 @@ - llbuild - swiftpm - xctest --libicu - libcxx - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild - install-swiftpm - install-xctest --install-libicu - install-prefix=/usr - install-libcxx - install-sourcekit-lsp -@@ -758,10 +755,8 @@ - # Executes the lit tests for the installable package that is created - # Assumes the swift-integration-tests repo is checked out - --test-installable-package - - # Build the benchmarks against the toolchain. --toolchain-benchmarks - - # Path to the root of the installation filesystem. - install-destdir=%(install_destdir)s diff --git a/indexstore.patch b/indexstore.patch deleted file mode 100644 index d3c43ab..0000000 --- a/indexstore.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur ./indexstore-db-orig/include/IndexStoreDB/Database/IDCode.h indexstore-db/include/IndexStoreDB/Database/IDCode.h ---- ./indexstore-db-orig/include/IndexStoreDB/Database/IDCode.h 2019-08-19 13:15:44.000000000 -0500 -+++ indexstore-db/include/IndexStoreDB/Database/IDCode.h 2020-01-23 16:20:05.055701686 -0600 -@@ -14,6 +14,7 @@ - #define INDEXSTOREDB_SKDATABASE_IDCODE_H - - #include <functional> -+#include <cstdint> - - namespace IndexStoreDB { - namespace db { diff --git a/llvm-indexstore.patch b/llvm-indexstore.patch deleted file mode 100644 index fac4669..0000000 --- a/llvm-indexstore.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- llvm-project/clang/include/indexstore/indexstore.h.orig 2020-08-30 20:56:38.552235207 -0500 -+++ llvm-project/clang/include/indexstore/indexstore.h 2020-08-30 20:58:02.746863308 -0500 -@@ -98,9 +98,11 @@ - - #define INDEXSTORE_OPTIONS_ATTRS INDEXSTORE_OPEN_ENUM_ATTR INDEXSTORE_FLAG_ENUM_ATTR - --#if defined(__has_extension) --#if __has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum) --# define INDEXSTORE_OPTIONS(_type, _name) enum INDEXSTORE_OPTIONS_ATTRS _name : _type _name; enum INDEXSTORE_OPTIONS_ATTRS _name : _type -+#if __has_feature(objc_fixed_enum) -+#ifdef __cplusplus -+# define INDEXSTORE_OPTIONS(_type, _name) enum INDEXSTORE_OPTIONS_ATTRS _name : _type -+#else -+# define INDEXSTORE_OPTIONS(_type, _name) enum _name : _type; typedef enum _name _name; enum INDEXSTORE_OPTIONS_ATTRS _name : _type - #endif - #endif - diff --git a/nosysctl.patch b/nosysctl.patch deleted file mode 100644 index a93e565..0000000 --- a/nosysctl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c ---- ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-19 22:20:35.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c 2020-04-24 21:29:34.742564898 -0500 -@@ -17,7 +17,7 @@ - - #if (TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD) && !TARGET_OS_CYGWIN - #include <dirent.h> --#if !TARGET_OS_ANDROID -+#if TARGET_OS_MAC || TARGET_OS_BSD - #include <sys/sysctl.h> - #endif - #include <sys/mman.h> -diff -Naur ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c ---- ./swift-corelibs-foundation-orig/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-19 22:20:35.000000000 -0500 -+++ swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c 2020-04-24 21:30:07.201669760 -0500 -@@ -27,7 +27,7 @@ - - #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD - #include <unistd.h> --#if !TARGET_OS_ANDROID -+#if TARGET_OS_MAC || TARGET_OS_BSD - #include <sys/sysctl.h> - #endif - #include <sys/stat.h> diff --git a/oldamd.patch b/oldamd.patch deleted file mode 100644 index a2e9ed8..0000000 --- a/oldamd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur ./swift-orig/cmake/modules/AddSwift.cmake ./swift/cmake/modules/AddSwift.cmake ---- ./swift-orig/cmake/modules/AddSwift.cmake 2020-10-28 15:44:53.000000000 -0500 -+++ ./swift/cmake/modules/AddSwift.cmake 2020-10-31 08:57:43.088514376 -0500 -@@ -356,7 +356,7 @@ - if("${CFLAGS_SDK}" STREQUAL "LINUX") - if(${CFLAGS_ARCH} STREQUAL x86_64) - # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic -- list(APPEND result "-march=core2") -+ list(APPEND result "-mcx16") - endif() - endif() - -diff -Naur ./swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake ./swift/stdlib/cmake/modules/AddSwiftStdlib.cmake ---- ./swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake 2020-10-28 15:44:53.000000000 -0500 -+++ ./swift/stdlib/cmake/modules/AddSwiftStdlib.cmake 2020-10-31 08:58:34.788036005 -0500 -@@ -287,7 +287,7 @@ - if("${CFLAGS_SDK}" STREQUAL "LINUX") - if(${CFLAGS_ARCH} STREQUAL x86_64) - # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic -- list(APPEND result "-march=core2") -+ list(APPEND result "-mcx16") - endif() - endif() - diff --git a/sources b/sources index 9a48519..542b6df 100644 --- a/sources +++ b/sources @@ -1,15 +1,19 @@ -SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 1f74fe3b0dcdde00ac32c621f636992dbee9130e1d83e3ff4c59a68f877e64ec6df390f614d2e1b492aa1ae203601a508dcb4b75f2b3103d16c53d1e4222d936 -SHA512 (corelibs-foundation.tar.gz) = f22cc8a0aee5060b62974d6bbf9e209b3a4708d7176951165df34b1b9a05d6e20f02094b220fcda43a7e374e460184dd1280ea106c14f3cbe059cfb808520815 -SHA512 (corelibs-libdispatch.tar.gz) = b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909 -SHA512 (corelibs-xctest.tar.gz) = 888928be7e49f60c05492036e51fa985481779ea7ceeab8b1ec028c27e54a9eddfed6b4f05500c413d0795bd61b43727e2282b5b89ecd58135b1071a80fd04ca -SHA512 (indexstore-db.tar.gz) = 5bf66eaebac97f5f794f752cd06c154b007f7741775a51160aaccd599865c255026acebaee1483f9aa75b660a379f09e6d689e03fbd3fe0db61de92504a99670 -SHA512 (llbuild.tar.gz) = a3139a30d95e7215cb1e4500d052534abd7ca40446098013cddddace3c7bad60be4e164a3054842844a3f2796b9e16cfd06f0784ac8f5351a3c1922e5f8a9a0f -SHA512 (llvm-project.tar.gz) = 6dbaaa7f970b1c5a179fc0951592067f7885e50d3f04caa3a48f0d18d86f009b9609319edd3c2ea4ca4789bacd5ab32fdcb6019d6380fddd5bc43832ddec2432 -SHA512 (package-manager.tar.gz) = 2bb9b397046640ccdcab3fea296a6bee445079b4c47569b9e856cac40f6d5a96902b18683a8e3fa28f23915706ab799c1e90975e521c054328d621db11db1fb2 +SHA512 (0.3.0.tar.gz) = 8a061581256e1516aa6af156f0054462e1e81db04e2f51d28f64794c5e08f97a0fd6e5e4f277b33092309693346a56ce3602d56fd6131766e977cd9b331ef98f +SHA512 (3.0.1.zip) = 62bc6d00eb768d310c776c1219f12c39e779a6d01a083ddbe5b784e626efd368a01478d564b5d150197ce4e227fb46cdf41aeaea06e2ade7a8a1b7cf5fda3ef2 +SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 +SHA512 (cmark.tar.gz) = cfff001159bf16407d9346f304190dce345e5868b4d8acf34fdb8c14529363c505967b0384026d954692a8a2a579048e8b52f1018155c7ceb3a80da965b19c90 +SHA512 (corelibs-foundation.tar.gz) = b41d67ec4b51cf5b4cf1cae5db0802e6c4f7a6eee05dc30aebb907827c9ae8eb12d79e17016c0c932b90b25318b5927a5ab53ffa1adc01b689b4a096e3cd7758 +SHA512 (corelibs-libdispatch.tar.gz) = 3aa78997dd03b86ce597bc3f031ca4fb452dbb1169f826fbce587d7d2cc5a2deb10ea9c00eaf6e89f4d486b1a8981024d1e1c5d252a4946aa1939bae733a4ff4 +SHA512 (corelibs-xctest.tar.gz) = 73371afcadf27f8795b9df04c78f3653972bc2d101256d00d7e3dd4d6f83a36fb361ed51dcb546f3fad001d06c555594a525e47900a296264e072ba9f210a9df +SHA512 (indexstore-db.tar.gz) = 612596e90dbdad98253e6e5edac1f3d5f5a40daf1d1286e6c439c549111221dc0432b87188e514c75cd5306a4abbb0e54c2a04590d321d87110cde9355a77321 +SHA512 (llbuild.tar.gz) = fe00a2dae3da8ec8e43ad430401b4e46c0bc1da2f8982e3094748f15fb0ed2f6aa4929e17514db5f552814aa363ff579fd681df2cd07d53cd828fedf68a34c95 +SHA512 (llvm-project.tar.gz) = ae851a8d79041370337e4fd393fbb820f6f377b56226e5637ba3f6f57e0670bb45502fdccb2c9c5bb4795b23f3146d98b9503cd58a4ecf774eaaabe9225262d3 +SHA512 (package-manager.tar.gz) = 577ee7ca20b886aa1283ba50237fb662ef1277996ffd6cfe17f07250da5ccaf7a12576dd138281e7b6dac20d707374065d1da8d470764f04389499d393ba4209 SHA512 (release-68-2.tar.gz) = 58061858a3385acd9e857045de412a08605a676a27da1dd10991fbf2bcff186220afc2ee183d775317056a301a8215031dd54c5725e88064a4fd3cd504235dae -SHA512 (sourcekit-lsp.tar.gz) = fd777e0920f57c84baf215b34814822f3e980479939c07c4c22ea6dd7545971607272e93971ef8dbd395df268865a99c27e8ca3d000a60b66b5443b9085b493b -SHA512 (swift-integration-tests.tar.gz) = d1b4ca6a759406b78e70abfca8520a3a6a31a0f50c36d394daf47fedd7a70a9691cc7a52c50dbcb18e6bb00b5493fceab8c96dd5f92f0be894adcef3603ce6f0 -SHA512 (swift-syntax.tar.gz) = 0b1e0f8df787b78a8ce76087cdeae16c614564427503198c543e6761de0f6c5cc6a1c3a90deefaa0cf3ea694cd1fef5f928e67f0d3c937cd424b2eaebd180363 -SHA512 (swift-xcode-playground-support.tar.gz) = 27464efbd5150714d54f6d084e4fcb070e5de9caf831d23ac5eb0b3fed8cf3404e6d436090ff172addd2c7b01cb77bbf8594e156d05cad36b665f682d0c06acb -SHA512 (swift.tar.gz) = cf12f36b003b081ce0210484324dc38d5decc9a16ae4ae08803402c9d639431b8b0053c7b07db4043c246f7760f9597d08af07ee546b0d1be0dd5a62e1fdc98c +SHA512 (sourcekit-lsp.tar.gz) = be72400d4db7d88c2f136d0aa6c7f0ef3f9716fa2fb072e891245bc7f7eb896f2567310e2cc3f75b61fdc6ee48625dddfb24ee7c0407d79f64ec5778ffbb50d7 +SHA512 (swift-driver.tar.gz) = 7f1e67c65ce6ed24d7dd346a037756aa77b0b3b5422339f84ed29377642bf4457058593d1e343223451059d76002db6796327145babc05688b7183e54f183813 +SHA512 (swift-integration-tests.tar.gz) = e8da92697da71e181a00a4a392a296a17159c2e2904a228bdab0f146dbcd50817a4aa6f70d297b1aea69ec0eb9b5afdd130fb7107b9ad171264b5c33acd823d1 +SHA512 (swift-syntax.tar.gz) = a17ad1b85b195477fc2ca58b1a9a259cfabddc33ed15f92c3a88baf08a3a18eebfc3cfb8c9242b41dab0a4f16299ca113e9cee9ba2349d26da5692e1e1a0dc5e +SHA512 (swift-tools-support-core.tar.gz) = 983d0db537d49ca2541af901616b90162e086185e6280c08eb48792af6380cacce9357c47d7d51a5c954d24783eb0a534b4618ba69698b0740074204dd27aee1 +SHA512 (swift-xcode-playground-support.tar.gz) = 09adf270ff44d53c285857a35a57d8e54537f9f0c3e12823a73c7b2ab3ab5f1daeb5a6532841aab90597c967696807377f74ff0907a7bc66249af1a76b26a3e5 +SHA512 (swift.tar.gz) = 21f7e923fd0968c805450192a54dc0c52601e2b6891bfd72a7e883c9f8474395d985f05e582a77b6ffbce83d93d93045aa9021ff506be2e9dd9ed4528ab4cd76 diff --git a/swift-build-setup.patch b/swift-build-setup.patch deleted file mode 100644 index 4480202..0000000 --- a/swift-build-setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini ---- swift-orig/utils/build-presets.ini 2020-04-21 15:42:23.000000000 -0500 -+++ swift/utils/build-presets.ini 2020-04-23 09:55:05.038603369 -0500 -@@ -789,7 +789,6 @@ - - dash-dash - --build-ninja - install-swift - install-lldb - install-llbuild -@@ -801,12 +800,7 @@ - install-sourcekit-lsp - build-swift-static-stdlib - build-swift-static-sdk-overlay --build-swift-stdlib-unittest-extra - --# Executes the lit tests for the installable package that is created --# Assumes the swift-integration-tests repo is checked out -- --test-installable-package - - # Build the benchmarks against the toolchain. - toolchain-benchmarks diff --git a/swift-for-fedora.patch b/swift-for-fedora.patch new file mode 100644 index 0000000..213fbf0 --- /dev/null +++ b/swift-for-fedora.patch @@ -0,0 +1,46 @@ +diff -Naur swift-orig/cmake/modules/AddSwift.cmake swift/cmake/modules/AddSwift.cmake +--- swift-orig/cmake/modules/AddSwift.cmake 2021-01-11 09:24:03.000000000 -0600 ++++ swift/cmake/modules/AddSwift.cmake 2021-01-14 16:07:26.118061686 -0600 +@@ -288,7 +288,7 @@ + if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64) + # this is the minimum architecture that supports 16 byte CAS, which is + # necessary to avoid a dependency to libatomic +- target_compile_options(${target} PRIVATE -march=core2) ++ target_compile_options(${target} PRIVATE -mcx16) + endif() + endif() + +diff -Naur swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake swift/stdlib/cmake/modules/AddSwiftStdlib.cmake +--- swift-orig/stdlib/cmake/modules/AddSwiftStdlib.cmake 2021-01-11 09:24:03.000000000 -0600 ++++ swift/stdlib/cmake/modules/AddSwiftStdlib.cmake 2021-01-14 16:06:49.905752127 -0600 +@@ -306,7 +306,7 @@ + if("${CFLAGS_SDK}" STREQUAL "LINUX") + if(${CFLAGS_ARCH} STREQUAL x86_64) + # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic +- list(APPEND result "-march=core2") ++ list(APPEND result "-mcx16") + endif() + endif() + +diff -Naur swift-orig/utils/build-presets.ini swift/utils/build-presets.ini +--- swift-orig/utils/build-presets.ini 2021-01-11 09:24:03.000000000 -0600 ++++ swift/utils/build-presets.ini 2021-01-14 15:42:31.063141040 -0600 +@@ -771,7 +771,6 @@ + libicu + libcxx + +-build-ninja + install-llvm + install-swift + install-lldb +@@ -787,10 +786,6 @@ + build-swift-static-sdk-overlay + build-swift-stdlib-unittest-extra + +-# Executes the lit tests for the installable package that is created +-# Assumes the swift-integration-tests repo is checked out +- +-test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks diff --git a/swift-lang.spec b/swift-lang.spec index 7846865..6e8d78f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,13 +1,15 @@ %global debug_package %{nil} -%global swifttag 5.3.3-RELEASE +%global swifttag 5.4-RELEASE %global swiftbuild swift-source -%global cmake_version 3.16.5 +%global cmake_version 3.19.3 %global icu_version 68-2 +%global yams_version 3.0.1 +%global sap_version 0.3.0
Name: swift-lang -Version: 5.3.3 -Release: 2%{?dist} +Version: 5.4 +Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -24,32 +26,30 @@ Source8: https://github.com/apple/swift-xcode-playground-support/archive/ Source9: https://github.com/apple/sourcekit-lsp/archive/swift-%%7Bswifttag%7D.tar.gz#... Source10: https://github.com/apple/indexstore-db/archive/swift-%%7Bswifttag%7D.tar.gz#... Source11: https://github.com/apple/llvm-project/archive/swift-%%7Bswifttag%7D.tar.gz#/... -Source12: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz -Source13: https://github.com/apple/swift-syntax/archive/swift-%%7Bswifttag%7D.zip#/swi... -Source14: https://github.com/Kitware/CMake/releases/download/v%%7Bcmake_version%7D/cma... - -Patch0: swift-build-setup.patch +Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%%7Bswifttag... +Source13: https://github.com/apple/swift-argument-parser/archive/%%7Bsap_version%7D.ta... +Source14: https://github.com/apple/swift-driver/archive/swift-%%7Bswifttag%7D.tar.gz#/... +Source15: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz +Source16: https://github.com/apple/swift-syntax/archive/swift-%%7Bswifttag%7D.zip#/swi... +Source17: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.zip +Source18: https://github.com/Kitware/CMake/releases/download/v%%7Bcmake_version%7D/cma... + +Patch0: swift-for-fedora.patch Patch1: compiler-rt-fuzzer.patch -Patch3: linux-tests-python-3-2.patch -Patch4: glibcpthread.patch -Patch6: nosysctl.patch -Patch7: indexstore.patch -Patch8: build-setup-s390x.patch -Patch9: llvm-indexstore.patch -Patch10: oldamd.patch -Patch11: %{name}-gcc11.patch +Patch2: linux-tests-python-3-2.patch +Patch3: glibcpthread.patch +Patch4: %{name}-gcc11.patch
BuildRequires: clang BuildRequires: swig BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel BuildRequires: libsqlite3x-devel -BuildRequires: libblocksruntime-static +BuildRequires: libdispatch-devel BuildRequires: libcurl-devel BuildRequires: libuuid-devel BuildRequires: libedit-devel @@ -98,13 +98,13 @@ correct programs easier for the developer. # Now we build our own CMake because the one in EPEL8 is too old and # we can safely build it for all platforms (though will add some time # to the whole build process) -%setup -q -c -n cmake -a 14 +%setup -q -c -n cmake -a 18 mkdir cmake-build cd cmake-build ../cmake-%{cmake_version}/bootstrap && make %endif
-%setup -q -c -n %{swiftbuild} -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 +%setup -q -c -n %{swiftbuild} -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 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -121,41 +121,30 @@ mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp mv indexstore-db-swift-%{swifttag} indexstore-db mv llvm-project-swift-%{swifttag} llvm-project mv swift-syntax-swift-%{swifttag} swift-syntax +mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core +mv swift-argument-parser-%{sap_version} swift-argument-parser +mv swift-driver-swift-%{swifttag} swift-driver
# ICU mv icu-release-%{icu_version} icu
+# Yams +mv Yams-%{yams_version} yams + # Since we require ninja for building, there's no sense to rebuild it just for Swift -%ifnarch s390x %patch0 -p0 -%else -# Couple other things for s390x -%patch8 -p0 -%endif
# Fixes an issue with using std::thread in a vector in compiler-rt %patch1 -p0
# Python 3 is the new default so we need to make the python code work with it -%patch3 -p0 +#%patch2 -p0
# Fixes compiler issue with glibc and pthreads after 2.5.0.9000 -%patch4 -p0 - -# sys/sysctl.h has been removed -%patch6 -p0 - -# implicit include of cstdint -%patch7 -p0 - -# Issue with enum declaration building with Clang 11 -%patch9 -p0 - -# For older AMD processors -%patch10 -p0 +%patch3 -p0
# For gcc-11 -%patch11 -p1 +%patch4 -p1
# Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py @@ -202,13 +191,18 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
%changelog +* Tue Apr 27 2021 Ron Olson tachoknight@gmail.com 5.4-1 +- Updated to swift-5.4-RELEASE +* Tue Apr 06 2021 Ron Olson tachoknight@gmail.com 5.4-1 +- Updated to swift-5.4-DEVELOPMENT-SNAPSHOT-2021-03-25-a * Tue Mar 30 2021 Jonathan Wakely jwakely@redhat.com - 5.3.3-2 - Rebuilt for removed libstdc++ symbol (#1937698) - * Thu Jan 28 2021 Ron Olson tachoknight@gmail.com 5.3.3-1 - Updated to swift-5.3.3-RELEASE * Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 5.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Thu Jan 21 2021 Ron Olson tachoknight@gmail.com 5.4-1 +- First working version of Swift 5.4 * Tue Dec 22 2020 Ron Olson tachoknight@gmail.com 5.3.2-1 - Updated to swift-5.3.2-RELEASE * Fri Dec 04 2020 Jeff Law law@redhat.com 5.3.1-2
commit 49474493f90278be59a49de60bd4a03573d0271e Author: Tomas Hrnciar thrnciar@redhat.com Date: Mon Apr 19 13:18:32 2021 +0200
BuildRequire setuptools explicitly
See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setupt...
diff --git a/swift-lang.spec b/swift-lang.spec index c5494d6..7846865 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -44,6 +44,7 @@ BuildRequires: swig BuildRequires: rsync BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-distro BuildRequires: libbsd-devel BuildRequires: libxml2-devel
commit 0921e447b2be73991d3cf30b85065c60dd52b647 Author: Jonathan Wakely jwakely@redhat.com Date: Tue Mar 30 19:40:15 2021 +0100
Rebuilt for removed libstdc++ symbol (#1937698)
diff --git a/swift-lang.spec b/swift-lang.spec index 2fe3782..c5494d6 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -7,7 +7,7 @@
Name: swift-lang Version: 5.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode URL: https://swift.org @@ -201,6 +201,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
%changelog +* Tue Mar 30 2021 Jonathan Wakely jwakely@redhat.com - 5.3.3-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Thu Jan 28 2021 Ron Olson tachoknight@gmail.com 5.3.3-1 - Updated to swift-5.3.3-RELEASE * Wed Jan 27 2021 Fedora Release Engineering releng@fedoraproject.org - 5.3.2-2
arch-excludes@lists.fedoraproject.org