diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-06-30 08:44:30 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-06-30 08:44:30 -0500 |
| commit | eac553bed03ecce03b82c6619e7021584079e5f4 (patch) | |
| tree | 886f9cbf117c9cf3d1fa76facc9315d24199de47 | |
| parent | 2c3f10d82b55c2805ea5b07294bc3c4dac4ac8a6 (diff) | |
| download | swift-lang-eac553bed03ecce03b82c6619e7021584079e5f4.tar.gz swift-lang-eac553bed03ecce03b82c6619e7021584079e5f4.tar.xz swift-lang-eac553bed03ecce03b82c6619e7021584079e5f4.zip | |
Cleaned up extraneous files and directories in swift-lldb directory
| -rw-r--r-- | swift-lang.spec | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/swift-lang.spec b/swift-lang.spec index 374a361..c09ac33 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,11 +1,11 @@ %global debug_package %{nil} -%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-28-a -%global swiftgithash 9f8f2a1 -%global swiftgitdate 20180628 +%global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-29-a +%global swiftgithash dab0d8e +%global swiftgitdate 20180629 %global swiftbuild swift-source Name: swift-lang Version: 4.2 -Release: 0.21.%{swiftgitdate}git%{swiftgithash}%{?dist} +Release: 0.22.%{swiftgitdate}git%{swiftgithash}%{?dist} Summary: Apple's Swift programming language License: ASL 2.0 URL: https://swift.org @@ -116,7 +116,6 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil %install export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 mkdir -p %{buildroot}%{_libexecdir}/swift-lldb -mkdir -p %{buildroot}%{_libexecdir}/swift-clang mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}/usr/lib mkdir -p %{buildroot}%{_includedir} @@ -141,8 +140,8 @@ install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift # 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 +# cp -r %{_builddir}/usr/lib/lldb %{buildroot}/usr/lib/swift-lldb +# cp -r %{_builddir}/usr/lib/python2.7 %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/liblldb.so.6.0.0 %{buildroot}/usr/lib/swift-lldb ln -fs liblldb.so.6.0.0 %{buildroot}/usr/lib/swift-lldb/liblldb.so.6 ln -fs liblldb.so.6 %{buildroot}/usr/lib/swift-lldb/liblldb.so @@ -159,7 +158,7 @@ ln -fs /usr/lib/swift %{buildroot}/usr/lib/swift-lldb/swift mkdir -p %{buildroot}/usr/lib/swift_static cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/usr/lib/swift_static -ln -fs /usr/lib/swift_static %{buildroot}/usr/lib/swift-lldb/swift_static +# ln -fs /usr/lib/swift_static %{buildroot}/usr/lib/swift-lldb/swift_static cp -r %{_builddir}%{_includedir}/* %{buildroot}%{_includedir} mv %{buildroot}%{_includedir}/lldb %{buildroot}%{_includedir}/swift-lldb @@ -186,6 +185,9 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m %postun -p /sbin/ldconfig %changelog +* Fri Jun 29 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.22.20180629gitdab0d8e +- Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-29-a, removed unnecessary + files and links * Fri Jun 29 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.21.20180628git9f8f2a1 - Updated to swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-28-a * Thu Jun 28 2018 Ron Olson <tachoknight@gmail.com> 4.2-0.20.20180626gitbe3b9a7 |