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=075ff7c979....
Change: +%ifarch aarch64
Thanks.
Full change: ============
commit 075ff7c9792df1eff0ba2d33e7a4ad16f0b301e4 Author: Ron Olson tachoknight@gmail.com Date: Sat Jun 8 15:52:54 2024 -0500
Rebuild to work with aarch64 and later versions of Swift
diff --git a/enablelzma.patch b/enablelzma.patch index 7d6f831..5371a21 100644 --- a/enablelzma.patch +++ b/enablelzma.patch @@ -1,11 +1,11 @@ ---- swift/utils/build-script-impl.orig 2023-06-05 14:16:42.981545978 -0500 -+++ swift/utils/build-script-impl 2023-06-05 14:17:12.167470913 -0500 -@@ -2209,7 +2209,7 @@ +--- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500 ++++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500 +@@ -2272,7 +2272,7 @@ -DLLDB_ENABLE_CURSES=ON -DLLDB_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_PYTHON=ON - -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LZMA=ON -DLLDB_ENABLE_LUA=OFF - -DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}" - -DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}" + -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY}) + -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}" diff --git a/fclose_issues.patch b/fclose_issues.patch index b2b0f8d..4625dd8 100644 --- a/fclose_issues.patch +++ b/fclose_issues.patch @@ -1,6 +1,6 @@ ---- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2023-08-15 14:01:48.975819260 -0500 -+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2023-08-15 14:02:09.449066299 -0500 -@@ -473,7 +473,7 @@ +--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2024-06-07 15:57:58.282574272 -0500 ++++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2024-06-07 16:00:41.442339293 -0500 +@@ -425,19 +425,19 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -9,7 +9,21 @@
// Read the data one block at a time. let data = BufferedOutputByteStream() -@@ -503,7 +503,7 @@ + var tmpBuffer = [UInt8](repeating: 0, count: 1 << 12) + while true { +- let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp) ++ let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp!) + if n < 0 { + if errno == EINTR { continue } + throw FileSystemError(.ioError(code: errno), path) + } + if n == 0 { +- let errno = ferror(fp) ++ let errno = ferror(fp!) + if errno != 0 { + throw FileSystemError(.ioError(code: errno), path) + } +@@ -455,12 +455,12 @@ if fp == nil { throw FileSystemError(errno: errno, path) } @@ -18,3 +32,9 @@
// Write the data in one chunk. var contents = bytes.contents + while true { +- let n = fwrite(&contents, 1, contents.count, fp) ++ let n = fwrite(&contents, 1, contents.count, fp!) + if n < 0 { + if errno == EINTR { continue } + throw FileSystemError(.ioError(code: errno), path) diff --git a/sources b/sources index 735cdd9..a45c2ce 100644 --- a/sources +++ b/sources @@ -1,37 +1,35 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 8588d884a587342599320f9326a819eda453042721bfa531ecb49ce371aa17a57d691124267e1918d09e77f3789cd97dd46ff1c74db95ffeb6eb383643d7a813 -SHA512 (corelibs-foundation.tar.gz) = 69eedc4fd77fe1177744e9ad2869f5d20c9f94f700db1d175fee4cb6aea91f1f37e933a9c4ab50decc7431d6acb52b811d003fa3278db73e6263dafb63dbfc15 -SHA512 (corelibs-libdispatch.tar.gz) = f7a6e8e5f450d63c8b6c9ed70f2099b669105f5f6d7ec1f6139fc3b4b5d30cc584b52d7d3c1e89a43252ab1dd56044417d57c6b9dcbf41edcabca0160c349165 -SHA512 (corelibs-xctest.tar.gz) = 894e9e795ed55fc49e12a1f588615375f5f692601ceb6be8cf5b1d505c1b9de251db981580be8d7e3e7ea693ebecf83c82f4941b347a296317f2233e3af6ec4e +SHA512 (cmark.tar.gz) = c53669e9d0166e8f62e7350455fdc96af181ca0c2876461807caa0a13a4ead466088d24f1e7de0e286e217806e0176c72c58da521750bfbca8860e177445158d +SHA512 (corelibs-foundation.tar.gz) = 6b574dbcd0f2fcc08093bb39a79bd1e8454ecdf3645ea9608e390370e8c63dad8e2e978084ac9e2c405b2c630287f5dab26cbbc9ee2ebad1892257776627eda2 +SHA512 (corelibs-libdispatch.tar.gz) = a3344e9df912c5cf86aa7e225748a22a747f48a41354e9bc38d03a20231676c199d2a1cd66091cc1edc87e2236fff79d92988b205c4921ec732c2a695fea23b6 +SHA512 (corelibs-xctest.tar.gz) = 1c804cfd6815a397241d2fcaa932950989507f3163c8d7ba777b726935d9ec1df59fbe2aa1b16c1dce0d52851ce14db64b0afec83113e4a1f754afad36b64a80 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = a3f48cc3d7f41232646ca753be0ba8ad17a5a6ce4f95b1e9e2c9587f31a15ba4395cc3a18bf20c2ccb2ded48fa725ecebee1e275eb51b48a4974dc68a21e99c4 -SHA512 (llbuild.tar.gz) = 41e1e434c8ccb30ff6c84d1a440e1a4d935f77db53489611f62ac9b3d717c6fe207c33b274df8be547eb20c85ff288416d7fcda67ae257ed55e5aa60df22306d -SHA512 (llvm-project.tar.gz) = 2ed9d1a2a38c9792c3a31cdf75a3d09a414a8f13a81cf93b0b4da39d59202ffa9f7c03502769c50a78d0c60ccfbebfce4a4cfd8f8c283bb29eb67a19ebc49294 +SHA512 (indexstore-db.tar.gz) = 6b088f42be7716ff03a77d8a14d0a5fed63f8d8680432badc76afd0a6ce8a61776b61fda59150165b12d9f5e54afcc493bd70ec28faac60a2ec6d9a48ba91945 +SHA512 (llbuild.tar.gz) = 1106ee4468e57daef87e81563ecdac07d34a7967110dd73b034d5106f1423d23df51158c6c40d02dc5dd0366d790e00bb8e9b9e59a71941912d77055320c1109 +SHA512 (llvm-project.tar.gz) = 16fbe31be33474d4d8bb2751dc7eb9634a001f2dfe929640b90995f2fece584427a9a83c7b84b63b8398737753acfab22ab11e016b2fab27b1a9a056d352c751 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 2143e7b7e947dc70333a84efc5bf00bb4e905e0894cdb9309e4c349ffe601a00e778a403654600523ab8716716b147c6de7b80609eea4c34eb164873115427a3 -SHA512 (sourcekit-lsp.tar.gz) = cee8bec5c82a332d34502659fb39e7287edd8349bc3427263ee0e87a6e3514f95b089457ce3fd9918260903f0ac0bcaded6adce8a0cbaaf6a500392e6eb311fa -SHA512 (swift-argument-parser.tar.gz) = 626837261015505348a9ca8e75439566fc9263c5451093af17fabcdbd94067c9eb171ce0ccf1c77df3b245927bc4e860b95b6a0932434d6ddda6beb6aff59877 -SHA512 (swift-asn1.tar.gz) = 53012967696474cbf425a683e850fe45782f85d6023fbc40e6f3d36fea1cd560cc2dd564afce6561012d7ddbc8c4e89bbf9db678ad8d782a3103fef8fda21544 +SHA512 (package-manager.tar.gz) = 9e725632568db8ebf1276dccc07efc8a28e5dc92821df87527e75529960d40412e02c840d7d14f9c2f1149de5cc30056bc05dc066bec5701bf47334c3b203184 +SHA512 (sourcekit-lsp.tar.gz) = 3ce7581ab1cae33ebd814a56f21efed069587b14a08c31cfc0af7053a2f7f4df1f949fafc78ca5b4286df6c1d8a35131521d67f6723e5dc6f923059c60419149 +SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-certificates.tar.gz) = e75a7aac0e89a7a26926d1095f81db53b9b5e3117fa0402958e97710ca2c72ed42f07191d7bd6dbecf46c692f1e5247ddf23da8e5b653ff3892626e5139b7b75 SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = 4a259a1d5827467afbf0d8ba36b680748065f58bcaba8a03fe33fa729de58d36280aaf99d5c198207a310a7ad4edd836061f8a9ebdab0622ba3a128076b90576 -SHA512 (swift-docc-render-artifact.tar.gz) = 555df7a6ef22450ee498c3e92145e875548f198fbba3f3c4bc28be3830af4b6f6598442083bf44d3652121e4fce8b961c95c2ff2e02f4edabaaadc5ff67763b0 -SHA512 (swift-docc-symbolkit.tar.gz) = 703ce3cb1a823ebdb104f88cb1ef506bafd74b03c0441cf1663156e474eb4710b4eb2cdd5722fb8cca9fb9fdcbb89adcc654519b72fa2de75f310362fad11018 -SHA512 (swift-docc.tar.gz) = ff1ffb4c6e3b2b443378f62375c9e263a1cc29b4c284de2396acc7e98481894d2cc3df338957190bbb445f34d818ca0a300c29ae3d3fad3d46fb20002959a04c -SHA512 (swift-driver.tar.gz) = 48a98f2d272814baac6d65f2e72e13bb3c33d7588cb9fc1076eea62c161b1191f16b2220f56590b650fdf1f1bf82495996c905a79fa1ea07ed84b2403f9097a6 -SHA512 (swift-experimental-string-processing.tar.gz) = 2cbc0964556952f05a15c9043880b3f578e6013382bc6a90fd264fdd3cf42bfad510c9c9f3b21898fcf2fc25e00afeca21726a75b7463e47453fdbcec44e8bd1 -SHA512 (swift-format.tar.gz) = 7b1ff69c22aa76d9a807ad0e204207661ddf57660e52fc2314e90d62f032573ea49d9c643d59f1c0215a1989d8b4c98f136d5a9a9fbcfa160b98cce4b85ec75a -SHA512 (swift-integration-tests.tar.gz) = 9c117b346be895a6edc5648406a2aa0c59eafe3be40db1d4ce7979dd237960191ff07743cd2b98c14abbb73beb02ce01a77813713367f45e26203d2576dacb5c -SHA512 (swift-lmdb.tar.gz) = 66c78106169c2722f5abb0bae7b69bc61a7713360ea8b6680c7fb4b41b594276f11b6454e5bc140238d2540535435dcaed5fd30fd1f896e138805634f96d0c00 -SHA512 (swift-markdown.tar.gz) = e96001f39e15a1e61a365090b04e522422516d16d270eb686d08c3e275c17a000f72c34ceccafe10a0d0d26dfcbde85370295f0568274385cce1530965c24374 +SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 +SHA512 (swift-docc-render-artifact.tar.gz) = c15adec69b5768ffcbe57cc7b08162d0475b9857057bb972be3bf909b973a4ed0103a1a5f182f108dfdf2c8c71131b3003cbfe7519df7fa645414bbd29507434 +SHA512 (swift-docc-symbolkit.tar.gz) = b4fa5587dbc85bb37af3904fd834efe1ead132ed07f076b146f78ee9947bb183a9fb6607686ed0cae4b92a19283fccfc39fefde378eb726396341ac12b874f58 +SHA512 (swift-docc.tar.gz) = 3cda8e2b01264a4b92e78dcff8629da2320d4461469dfe3a5589a14862ec88198d718dd8fad843953c89397d06c0cb0bf418bcdbfab9be905dadce75b125eafa +SHA512 (swift-driver.tar.gz) = 9da3de6b4242406f3465da42101ac4d64e295916a54b6a52dce7334ab62ca1e40305d2a202873060cf69dcb921d9b0f8a8229090a25613461b991eb334df5bf8 +SHA512 (swift-experimental-string-processing.tar.gz) = caebf49d60f589cdd377ccc72005f2c958e90e50cc650f077c42f8ee8e18e744925efa4786bfccbecb186f2cc383c859b75216a8449422a4a18f056e2e64ed99 +SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 +SHA512 (swift-integration-tests.tar.gz) = fbf26c69cd8b3e0f0f028aaf9da81f14ce528a2495f03b612ad0206e04c0c5b73dbe328b8953cbf168e406d11c01c72f6f38aa51965ca3fa72e9304b2057c8e2 +SHA512 (swift-lmdb.tar.gz) = 2d63f67867b767e9d2763308d15d9eac546de24cc93226a6b3a9a3f2d506c47f1d32d54c3faf4accb859d2872d7233e258e40f91b77c7968389b81861cc71b98 +SHA512 (swift-markdown.tar.gz) = a190320d309701fc86125fa78eb78bed01d831b00baab44f4f57ef6e27115180c29dbf6bafde3f1ed95a2c3584c8d47b96e586aaa69179b57a9f86cfe4273754 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-stress-tester.tar.gz) = 3faff28a3739622c7b19a0a0145cd4b21e109b96fc1715222a62ea7cb91a0d12be8b975b9a4ca4118ac5ec8b4c7329b2520410f986a360312f008fb3cf55b716 -SHA512 (swift-syntax.tar.gz) = d6cd899515d112175ce6226eb9503e241ebdbd67497c7055bee88ca903e09eb8354e2ae1df0369b8d835f60d93191c55fd58a77280951d4df67891f8cbc0cd32 +SHA512 (swift-stress-tester.tar.gz) = e94601e1e26838c38a280008222a118ace80fbf45d6eadcf7467eafa2ef4bd4affa31478c299570018a89a0c3850466b70022d2523d708959c680dc2b089075e +SHA512 (swift-syntax.tar.gz) = b9c016b6cd2ff40db6321df710d21a0de286160c71bba6d41aef33d360ffcc5203ac9a50fb850c1fd74014510b2a6d560881a531f99bf8876569d8366866aba3 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = b0a3d00ff16a3ff3dc99c58965acebdf0bb77eb69d0dd69d7ffa4ce50a638c02446f15a598ce62ff7a9b724439b46fb7b110086bc7f738e71e9d9b5eabd9b521 -SHA512 (swift-xcode-playground-support.tar.gz) = 9131baf7f9dbd388b566c7bea7d9a2c8d89d8c1e60a56f07c71c8756861aafb53de58e6412c996580a9b32150fa97d22bc04c5f8c94ca39f64b922f4b6c1f335 -SHA512 (swift.tar.gz) = 4c4fd2b08417f66bde5c8b5e54c41716071f7a5b3e8d772e9c8f7ea79d569a2c2a6920108d6c51dfe7e6c4b2727e5a762059997e3a7edd75b93651b262ab6d5f +SHA512 (swift-tools-support-core.tar.gz) = f38400d2fb31017c4ff186bde408a1d3523ab6a6f1044668c4655a4737b7233552dbc2ec1035bdb18ecf07df500ac32e6a313df58292567069bab2ab52530f05 +SHA512 (swift-xcode-playground-support.tar.gz) = 66b186c8d6e8574e693172fa2acde44dd4d7b2225130c4f701a2d3a0922a9fce25e5889f391ebfb8074b55614654349365ef696e4089f418ddeec4f0162162cc +SHA512 (swift.tar.gz) = 2cc0a34fc4451553acea9be14b56d8e33dfa9f4a65847426f0998113cb42af5cf56acbda7be55b07e3f1a8524af66a98d786f5e8b770cf733159d6b84588d21d SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/strlcpy_issues.patch b/strlcpy_issues.patch deleted file mode 100644 index ece318b..0000000 --- a/strlcpy_issues.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h.orig 2023-07-07 10:11:34.527268974 -0500 -+++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-07 10:12:16.161933020 -0500 -@@ -189,7 +189,7 @@ - #define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0) - #endif - --#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 -+#if (TARGET_OS_LINUX_NO_FOR_GLIBC && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32 - CF_INLINE size_t - strlcpy(char * dst, const char * src, size_t maxlen) { - const size_t srclen = strlen(src); diff --git a/swift-lang.spec b/swift-lang.spec index 79c5cb2..5e0d0ee 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -6,16 +6,16 @@ ################################################# # Make sure these are changed for every release! ################################################# -%global swift_version 5.9-RELEASE -%global fedora_release 1 -%global package_version 5.9 +%global swift_version 5.8.1-RELEASE +%global fedora_release 3 +%global package_version 5.8.1
# Set to the right version per the json file %global swift_source_location swift-source %global icu_version 65-1 %global yams_version 5.0.1 -%global swift_argument_parser_version 1.2.2 -%global swift_crypto_version 2.5.0 +%global swift_argument_parser_version 1.0.3 +%global swift_crypto_version 2.2.3 %global ninja_version 1.11.1 %global cmake_version 3.19.6 %global swift_atomics_version 1.0.2 @@ -24,17 +24,15 @@ %global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 -%global swift_certificates_version 0.4.1 -%global swift_asn1_version 0.7.0
# Temporary I presume as the json file suggests there should # be eventually a release version of swift-format -%global swift_format_version 508.0.0 +%global swift_format_version 0.50700.1
Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.2 +Release: %{fedora_release}%{?dist} Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -54,42 +52,43 @@ Source11: https://github.com/apple/llvm-project/archive/swift-%%7Bswift_vers Source12: https://github.com/apple/swift-tools-support-core/archive/swift-%%7Bswift_ve... Source13: https://github.com/apple/swift-argument-parser/archive/%%7Bswift_argument_pa... Source14: https://github.com/apple/swift-driver/archive/swift-%%7Bswift_version%7D.tar... -Source15: https://github.com/apple/swift-syntax/archive/swift-%%7Bswift_version%7D.zip... -Source16: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.tar.gz#/yams.tar.g... -Source17: https://github.com/apple/swift-crypto/archive/refs/tags/%%7Bswift_crypto_ver... -Source18: https://github.com/ninja-build/ninja/archive/refs/tags/v%%7Bninja_version%7D... -Source19: https://github.com/KitWare/CMake/archive/refs/tags/v%%7Bcmake_version%7D.tar... -Source20: https://github.com/apple/swift-atomics/archive/%%7Bswift_atomics_version%7D.... -Source21: https://github.com/apple/swift-stress-tester/archive/swift-%%7Bswift_version... -Source22: https://github.com/apple/swift-docc/archive/swift-%%7Bswift_version%7D.tar.g... -Source23: https://github.com/apple/swift-docc-render-artifact/archive/swift-%%7Bswift_... -Source24: https://github.com/apple/swift-docc-symbolkit/archive/swift-%%7Bswift_versio... -Source25: https://github.com/apple/swift-collections/archive/%%7Bswift_collections_ver... -Source26: https://github.com/apple/swift-numerics/archive/%%7Bswift_numerics_version%7... -Source27: https://github.com/apple/swift-system/archive/%%7Bswift_system_version%7D.ta... -Source28: https://github.com/apple/swift-nio/archive/%%7Bswift_nio_version%7D.tar.gz#/... -Source29: https://github.com/apple/swift-nio-ssl/archive/%%7Bswift_nio_ssl_version%7D.... +Source15: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz... +Source16: https://github.com/apple/swift-syntax/archive/swift-%%7Bswift_version%7D.zip... +Source17: https://github.com/jpsim/Yams/archive/%%7Byams_version%7D.tar.gz#/yams.tar.g... +Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%%7Bswift_crypto_ver... +Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%%7Bninja_version%7D... +Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%%7Bcmake_version%7D.tar... +Source21: https://github.com/apple/swift-atomics/archive/%%7Bswift_atomics_version%7D.... +Source22: https://github.com/apple/swift-stress-tester/archive/swift-%%7Bswift_version... +Source23: https://github.com/apple/swift-docc/archive/swift-%%7Bswift_version%7D.tar.g... +Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%%7Bswift_... +Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%%7Bswift_versio... +Source26: https://github.com/apple/swift-collections/archive/%%7Bswift_collections_ver... +Source27: https://github.com/apple/swift-numerics/archive/%%7Bswift_numerics_version%7... +Source28: https://github.com/apple/swift-system/archive/%%7Bswift_system_version%7D.ta... +Source29: https://github.com/apple/swift-nio/archive/%%7Bswift_nio_version%7D.tar.gz#/... +Source30: https://github.com/apple/swift-nio-ssl/archive/%%7Bswift_nio_ssl_version%7D.... %dnl Source31: https://github.com/apple/swift-format/archive/swift-%%7Bswift_version%7D.tar... -Source30: https://github.com/apple/swift-format/archive/refs/tags/%%7Bswift_format_ver... -Source31: https://github.com/apple/swift-lmdb/archive/swift-%%7Bswift_version%7D.tar.g... -Source32: https://github.com/apple/swift-markdown/archive/swift-%%7Bswift_version%7D.t... -Source33: https://github.com/apple/swift-experimental-string-processing/archive/swift-... +Source31: https://github.com/apple/swift-format/archive/refs/tags/%%7Bswift_format_ver... +Source32: https://github.com/apple/swift-lmdb/archive/swift-%%7Bswift_version%7D.tar.g... +Source33: https://github.com/apple/swift-markdown/archive/swift-%%7Bswift_version%7D.t... +Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-... %dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%%7Bswift_version... -Source34: https://github.com/apple/swift-certificates/archive/%%7Bswift_certificates_v... -Source35: https://github.com/apple/swift-asn1/archive/%%7Bswift_asn1_version%7D.tar.gz... -Source36: https://github.com/unicode-org/icu/archive/release-%%7Bicu_version%7D.tar.gz... -
Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch Patch5: no-test.patch -Patch6: strlcpy_issues.patch -Patch7: fclose_issues.patch -Patch8: new_glibc.patch +Patch7: fclose_issues.patch +Patch8: new_glibc.patch +
+%ifarch aarch64 +BuildRequires: clang15 +%else BuildRequires: clang +%endif BuildRequires: swig BuildRequires: rsync BuildRequires: python3 @@ -139,7 +138,7 @@ correct programs easier for the developer.
%prep -%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 -a 34 -a 35 -a 36 +%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 -a 34 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -176,8 +175,6 @@ mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown mv swift-stress-tester-swift-%{swift_version} swift-stress-tester mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing -mv swift-certificates-%{swift_certificates_version} swift-certificates -mv swift-asn1-%{swift_asn1_version} swift-asn1
# ICU mv icu-release-%{icu_version} icu @@ -192,6 +189,9 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
+# Fix for uinit_ptr not being declared implicitly +%patch -P1 -p0 + # Enable LZMA %patch -P2 -p0
@@ -210,17 +210,17 @@ mv ninja-%{ninja_version} ninja # seperately. %patch -P8 -p0
- %build export VERBOSE=1 -# EPEL8 may not have /usr/bin/python, so we -# roll our own because the build script expects there to be one. -%if 0%{?el8} -if [ ! -d $PWD/binforpython ] ; then - mkdir -p $PWD/binforpython - ln -s /usr/bin/python3 $PWD/binforpython/python + +# Specific for aarch64 architecture +%ifarch aarch64 +if [ ! -d $PWD/oldclang ] ; then + mkdir -p $PWD/oldclang + ln -s /usr/bin/clang-15 $PWD/oldclang/clang + ln -s /usr/bin/clang++-15 $PWD/oldclang/clang++ fi -export PATH=$PWD/binforpython:$PATH +export PATH=$PWD/oldclang:$PATH %endif
# Here we go! @@ -236,6 +236,8 @@ ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir} ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp mkdir -p %{buildroot}%{_mandir}/man1 cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1 +mkdir -p %{buildroot}/usr/lib +ln -fs %{_libexecdir}/swift/%{package_version}/lib/swift %{buildroot}/usr/lib/swift
# This is to fix an issue with check-rpaths complaining about # how the Swift binaries use RPATH @@ -249,6 +251,7 @@ export QA_SKIP_RPATHS=1 %{_bindir}/sourcekit-lsp %{_mandir}/man1/swift.1.gz %{_libexecdir}/swift/ +%{_usr}/lib/swift
%post -p /sbin/ldconfig @@ -256,18 +259,24 @@ export QA_SKIP_RPATHS=1
%changelog -* Fri Jun 07 2024 Python Maint python-maint@redhat.com - 5.9-1.2 -- Rebuilt for Python 3.13 - -* Sat Jan 27 2024 Fedora Release Engineering releng@fedoraproject.org - 5.9-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Sep 18 2023 Ron Olson tachoknight@gmail.com - 5.9-1 -- Updated to Swift 5.9-RELEASE - Resolves: rhbz#2239543 -* Wed Mar 29 2023 Ron Olson tachoknight@gmail.com - 5.9-1 -- Cleanup and first attempt at getting 5.9 going though - 5.8 hasn't been released yet +* Fri Feb 16 2024 Ron Olson tachoknight@gmail.com 5.8.1-3 +- Added symlink for future versions of Swift +* Tue Aug 22 2023 Ron Olson tachoknight@gmail.com 5.8.1-2 +- Added patch to work with glibc 2.38 + Resolves: rhbz#2226476 + +* Sat Jul 22 2023 Fedora Release Engineering releng@fedoraproject.org - 5.8.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint python-maint@redhat.com - 5.8.1-1.1 +- Rebuilt for Python 3.12 + +* Fri Jun 02 2023 Ron Olson tachoknight@gmail.com - 5.8.1-1 +- Updated to Swift 5.8.1-RELEASE + Resolves: rhbz#2211845 +* Fri Mar 31 2023 Ron Olson tachoknight@gmail.com - 5.8-1 +- Updated to Swift 5.8-RELEASE + Resolves: rhbz#2183429 * Sat Jan 21 2023 Fedora Release Engineering releng@fedoraproject.org - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Tue Dec 27 2022 Ron Olson tachoknight@gmail.com - 5.8-1
commit 11b897461e5d589db7a3091299df0cc965e7ca1e Author: Python Maint python-maint@redhat.com Date: Fri Jun 7 11:12:29 2024 +0200
Rebuilt for Python 3.13
diff --git a/swift-lang.spec b/swift-lang.spec index d3bca20..79c5cb2 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -34,7 +34,7 @@
Name: swift-lang Version: %{package_version} -Release: %{fedora_release}%{?dist}.1 +Release: %{fedora_release}%{?dist}.2 Summary: The Swift programming language License: Apache-2.0 URL: https://www.swift.org @@ -256,6 +256,9 @@ export QA_SKIP_RPATHS=1
%changelog +* Fri Jun 07 2024 Python Maint python-maint@redhat.com - 5.9-1.2 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering releng@fedoraproject.org - 5.9-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
arch-excludes@lists.fedoraproject.org