From 5401212c883d688d74db0accc0156873794288a6 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Nov 15 2020 15:07:17 +0000 Subject: Updated to swift-5.3.1-RELEASE --- diff --git a/oldamd.patch b/oldamd.patch new file mode 100644 index 0000000..a2e9ed8 --- /dev/null +++ b/oldamd.patch @@ -0,0 +1,24 @@ +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 785548d..712e6a4 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ SHA512 (cmake-3.16.5.tar.gz) = 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671 -SHA512 (cmark.tar.gz) = 75834190177c95123f582e9eb35339d66b2b0aa8c5d31c528efde9554f0def94e3cc81f1211f091795e4ba9aac71f90ef082d3b363549ae78454d722ae78404b -SHA512 (corelibs-foundation.tar.gz) = 2292c8bc7ec49bef6b7b694cb5cbc49808a7460e49f795d5381826941e5b8241bf1b12cc869868aebe0cb8ed81fab8d6c614095e044c60d394595d11cf5e3203 -SHA512 (corelibs-libdispatch.tar.gz) = 9d6dd163a86a9e97d30cea0a268ccf06cee846f7a140722ccb4e73d01a716207be1ab7209ff51f0246fd2fbba43329e4c079fdc2bff991fd0e2c22364dd95cbc -SHA512 (corelibs-xctest.tar.gz) = b763c4a31e5ad0da4930b89c6093b29f22884fa6f890a4e322124c7a91d4dc2fafe90d322dffd6b7d7e1f606e03c8b33dfd9276ab1c3427145e3d5491070b274 -SHA512 (indexstore-db.tar.gz) = 7b57bb47f8651926b54e90e448db99addc4128ba808b2786b907713d5264df8fdf873bec95b146326bb001b58bfad92b5bccc0ef50161adc591512c925daac23 -SHA512 (llbuild.tar.gz) = f5ae7d4918144a890726ad76c1adb9a20a36460411b7b5d7c6305b6b4862aadb47304846a9c1a49f839b851ca82bdede36ca0d621a82ba9fb1876ea6be79e356 -SHA512 (llvm-project.tar.gz) = d2adb502cf11bb5894e05f20759d9c42af966f9577424fcd0b5db07d509040288e803bacde17c1e366623f8be65573802f528dd586c716a6393a608943343528 -SHA512 (package-manager.tar.gz) = d9511bf98f677ebba4c321e107861e032eaeb7f9950335201895acfbcb13ffaa4c9fcfbadac4aae7712ae9218b3f085aede9295740d14e9a9d8c07e02b853c9c +SHA512 (cmark.tar.gz) = a1529cc518f878adfd6fd7a44450b6dc89aa395e5715e0d35f8256521ab924f8da47e2f8bbbd1182ae36436f1953fa5fed18c107a8c530bffdb9d03728908419 +SHA512 (corelibs-foundation.tar.gz) = 4f0474ccb8502a24985b2f314332323f32740b6127f3669c6c0b63d429589da377012595b53c9e242515df3ab436f67f7865f05eeec1486872796943ec79eddd +SHA512 (corelibs-libdispatch.tar.gz) = 96ea68c41a3e5460efe612cdea2277f34df38ca2896d78c89fed0edd65376bcd2f543263775aeee2f8ac6922864bcae9dceaa49fcc8142a61a82ec69f7288057 +SHA512 (corelibs-xctest.tar.gz) = 5a6d0aed7d03a78352c3496f12586d83e61339bf01d198bd49700a50400891495dfbae33c791316fd5ea14708c985ac5422af34b0af49a1b55d0133cfca79252 +SHA512 (indexstore-db.tar.gz) = 6763ded7b3925dbdc9ced715c73526cea96e311509842c9b94325bb87ca15832140a5af59534627f9d944cac967256d414d6bc50f2bef9b14d885fbe5d600006 +SHA512 (llbuild.tar.gz) = ba86f3429073e27ec2bb345b9b85b26a218f996c6e33d2045dcc7d98c13cbbb3dee55d2a12747250546602134daaa267ddc0944cd4d48aea02674c966ef0ab1f +SHA512 (llvm-project.tar.gz) = 2146ba56b6764902146c3b49b654e368444f9d6ebe2d6294bd505ae80899b53d00792ce25e77ae9ad1cbdb1c929faa04996e0b916b392df0271c0c8527c529e6 +SHA512 (package-manager.tar.gz) = d6ef21373389563b0bd021a61a93354345e1a43ed71d2f616b247a11ad03927c68bab345dbde9981dc8a4a1842e290a76e176ce9432651c5ddef18ac1dd6365e SHA512 (release-67-1.tar.gz) = 1b7b9b908f914a84c59f248f9d9fd5d0e72df3d9742ded10466af866d587aef410341361a6a8ba70ce1b7e99be15cedca271639e0f7d8589c968e6df0ee6ea97 -SHA512 (sourcekit-lsp.tar.gz) = 58af4e577133a65268daeed22cbbe827234be62319e5f6c6e8efb0760b3cdeac10308c55b7858b7e9f0190b0642f8cf62fce403abbc8274bd9399e84852fd8bf -SHA512 (swift-integration-tests.tar.gz) = ffdda011ce2d961a6e7182121cf52e4b2f461babc2340dae64fff5aed000d5f5f3b7a0039f01668ab1538580601c3ac3962745d80b4d7d2f227d4728b6961d1d -SHA512 (swift-syntax.tar.gz) = ba4964e22562600abdd36b01084b8bbf98b396d960d7e14ff0ead7a709c70d91fc37022a3356a41cf915ce450d35a4b5b595b838527aa0eb42a1a201c83cbcfc -SHA512 (swift-xcode-playground-support.tar.gz) = 760a3aaccd0a7587802991e98b650e1ab82cd56b45f99f787688f87020b66924a09e3032943cd7455804aa7f60a2c04f46c8184d331ea605658f473092fc8279 -SHA512 (swift.tar.gz) = 835ee9fc7689d7d9b92eda3d2458025409e574e86cdd59e4cb0e200e3d900ced26c8cf71ccbf02965989591deac9bbe43411a42947a7e47f371289cb84e42f35 +SHA512 (sourcekit-lsp.tar.gz) = 1ae05fca38626757adb32405994936bf13de3b8974d0609ed02fa7d3463615b271dd6002e01aebeddbc5751219b8e93c1e262bda54db6e851113b85757060a50 +SHA512 (swift-integration-tests.tar.gz) = 375172406bd07b4266ef1bc650de4b254dc532b64161a96d655a28b4062461683a57081bc41f0219f7926c49e928e71563dc04f0d0d3f7e0b2376c7c73c89c16 +SHA512 (swift-syntax.tar.gz) = 566e4707987c596a526b1dc85c5c2e673e21031a99952d49b31fd8672719d33cfd72ff3044fa2684b40b9bb85ba615ff8eeadf7dd963654e6db26c0678e2d498 +SHA512 (swift-xcode-playground-support.tar.gz) = 496b36eb21bd38f0f1f96b2dd381721a6d4ef413f218881b71a599cd9823d9c0a97a366f13ce1a1e2564b0696649197e01f7ec0c4d5b2fdb86d727fbb78f02f4 +SHA512 (swift.tar.gz) = 0abfa73b106fe22189808ff473fcd4e515db44acf7b1b71d9a83e5615572c3ac48f4e11d6d76e16ef04d59b94a022c80c819f516c50e29ffaf870db3d22fa32f diff --git a/swift-lang.spec b/swift-lang.spec index bed47f9..0f6748e 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,12 +1,12 @@ %global debug_package %{nil} -%global swifttag 5.3-RELEASE +%global swifttag 5.3.1-RELEASE %global swiftbuild swift-source %global cmake_version 3.16.5 %global icu_version 67-1 Name: swift-lang -Version: 5.3 +Version: 5.3.1 Release: 1%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 and Unicode @@ -36,6 +36,7 @@ Patch6: nosysctl.patch Patch7: indexstore.patch Patch8: build-setup-s390x.patch Patch9: llvm-indexstore.patch +Patch10: oldamd.patch BuildRequires: clang BuildRequires: swig @@ -148,6 +149,9 @@ mv icu-release-%{icu_version} icu # Issue with enum declaration building with Clang 11 %patch9 -p0 +# For older AMD processors +%patch10 -p0 + # Fix python to python3 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" swift/utils/api_checker/swift-api-checker.py pathfix.py -pni "%{__python3} %{py3_shbang_opts}" llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize @@ -193,7 +197,9 @@ cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 %changelog -* Mon Sep 17 2020 Ron Olson 5.3-1 +* Fri Nov 13 2020 Ron Olson 5.3.1-1 +- Updated to swift-5.3.1-RELEASE +* Thu Sep 17 2020 Ron Olson 5.3-1 - Updated to swift-5.3-RELEASE * Mon Aug 10 2020 Ron Olson 5.2.5-1 - Updated to swift-5.2.5-RELEASE