diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-04-16 13:12:03 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-04-16 13:12:03 -0500 |
| commit | 714ad900075599a9f19b044ae5679459014c88a5 (patch) | |
| tree | 51a62cd44d4adbed0586448dd9e9b6c7ebedf324 | |
| parent | 2e8955e9705389aa27522097b6092787cf78e0a4 (diff) | |
| download | swift-lang-714ad900075599a9f19b044ae5679459014c88a5.tar.gz swift-lang-714ad900075599a9f19b044ae5679459014c88a5.tar.xz swift-lang-714ad900075599a9f19b044ae5679459014c88a5.zip | |
Added comment about why we're using lib instead of lib64, also updated to latest version of Swift 4.2
| -rw-r--r-- | swift-lang.spec | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/swift-lang.spec b/swift-lang.spec index 730b37d..88931a0 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,10 +1,10 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-04-11-a -%global swiftgithash 537a846 -%global swiftgitdate 20180411 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-04-15-a +%global swiftgithash 22530b9 +%global swiftgitdate 20180415 Name: swift-lang Version: 4.2 -Release: 0.3.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.4.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -86,6 +86,9 @@ mv swift-swift-%{swifttag} swift mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support mv ninja-1.7.2 ninja +# This patch tells the Swift executable to look for its Swift-specific +# lldb executable in /usr/libexec/swift-lldb, not in the same directory +# as the swift executable (i.e. /usr/bin). %patch0 -p0 @@ -113,6 +116,12 @@ ln -fs swift %{buildroot}/usr/bin/swift-format install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb +# Why /usr/lib instead of %{_libdir}? +# The Swift toolchain is *extermely* sensitive to locations of its files +# (for example, the need for the patch above in the prep section) and +# has "lib" hardcoded in many, many places throughout all the projects that +# make up the Swift toolchain. Since we use subdirectories for the +# libraries, no actual .so files are dumped in /usr/lib. mkdir -p %{buildroot}/usr/lib/swift-lldb cp -r %{_builddir}/usr/lib/lldb %{buildroot}/usr/lib/swift-lldb cp -r %{_builddir}/usr/lib/python2.7 %{buildroot}/usr/lib/swift-lldb @@ -161,6 +170,8 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift %postun -p /sbin/ldconfig %changelog +* Mon Apr 16 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.4.20180415git22530b9 +- Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-15-a * Thu Apr 12 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.3.20180411git537a846 - Updated to swift-DEVELOPMENT-SNAPSHOT-2018-04-11-a * Wed Feb 28 2018 Ron Olson <tachoknight@gmail.com> 4.1-0.2.20180227git5f2f440 |