diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-02-11 10:21:58 -0600 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-02-11 10:21:58 -0600 |
| commit | 9c1ab2faedc9630115e4f1e3193b464fc4d67700 (patch) | |
| tree | fb3398600ae035a715046645a23a4bee303b5af8 | |
| parent | 45041aacf525738531d35a8665cb6d1f0539fed3 (diff) | |
| download | swift-lang-9c1ab2faedc9630115e4f1e3193b464fc4d67700.tar.gz swift-lang-9c1ab2faedc9630115e4f1e3193b464fc4d67700.tar.xz swift-lang-9c1ab2faedc9630115e4f1e3193b464fc4d67700.zip | |
More bug fixes, Swift really wants its libs in /usr/lib
| -rw-r--r-- | swift-lang.conf | 4 | ||||
| -rw-r--r-- | swift-lang.spec | 28 |
2 files changed, 17 insertions, 15 deletions
diff --git a/swift-lang.conf b/swift-lang.conf index e1b9129..7ad92c4 100644 --- a/swift-lang.conf +++ b/swift-lang.conf @@ -1,2 +1,2 @@ -/usr/lib64/swift-lldb -/usr/lib64/swift/linux +/usr/lib/swift-lldb +/usr/lib/swift/linux diff --git a/swift-lang.spec b/swift-lang.spec index 203b08a..2056b88 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -93,26 +93,28 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil %install mkdir -p %{buildroot}%{_libexecdir}/swift-lldb mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_libdir} +mkdir -p %{buildroot}/usr/lib mkdir -p %{buildroot}%{_includedir} install -m 0755 %{_builddir}/usr/bin/swift* %{buildroot}%{_bindir} install -m 0755 %{_builddir}/usr/bin/lldb* %{buildroot}%{_libexecdir}/swift-lldb install -m 0755 %{_builddir}/usr/bin/liblldb-intel-mpxtable.so %{buildroot}%{_libexecdir}/swift-lldb install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb -mkdir -p %{buildroot}/%{_libdir}/swift-lldb -cp -r %{_builddir}/usr/lib/lldb %{buildroot}%{_libdir}/swift-lldb -cp -r %{_builddir}/usr/lib/python2.7 %{buildroot}%{_libdir}/swift-lldb -cp %{_builddir}/usr/lib/liblldb* %{buildroot}%{_libdir}/swift-lldb -cp %{_builddir}/usr/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/swift-lldb +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 %{_builddir}/usr/lib/liblldb.so.5.0.0 %{buildroot}/usr/lib/swift-lldb +ln -fs liblldb.so.5.0.0 %{buildroot}/usr/lib/liblldb.so.5 +ln -fs liblldb.so.5 %{buildroot}/usr/lib/liblldb.so +cp %{_builddir}/usr/lib/libsourcekitdInProc.so %{buildroot}/usr/lib/swift-lldb cp %{_builddir}/usr/lib/libswiftDemangle.so %{buildroot}%{_libdir}/swift-lldb ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift -mkdir -p %{buildroot}/%{_libdir}/swift -cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/%{_libdir}/swift +mkdir -p %{buildroot}/usr/lib/swift +cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/usr/lib/swift -mkdir -p %{buildroot}/%{_libdir}/swift_static -cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/%{_libdir}/swift_static +mkdir -p %{buildroot}/usr/lib/swift_static +cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/usr/lib/swift_static cp -r %{_builddir}%{_includedir}/* %{buildroot}%{_includedir} mv %{buildroot}%{_includedir}/lldb %{buildroot}%{_includedir}/swift-lldb @@ -131,9 +133,9 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift %{_mandir}/man1/* %{_datarootdir}/swift/LICENSE.txt %{_includedir}/* -%{_libdir}/swift-lldb/* -%{_libdir}/swift/* -%{_libdir}/swift_static/* +/usr/lib/swift-lldb/* +/usr/lib/swift/* +/usr/lib/swift_static/* %{_libexecdir}/swift-lldb/* %{_sysconfdir}/ld.so.conf.d/swift-lang.conf |