From 0d6f63ba43ea19cc77bd09032574b68c90968fc3 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 8 May 2017 17:07:02 -0700
Subject: [PATCH] Move shared libraries back to libdir and symlink in rustlib

---
 rust.spec | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/rust.spec b/rust.spec
index 027dcff..817ea7b 100644
--- a/rust.spec
+++ b/rust.spec
@@ -48,7 +48,7 @@
 
 Name:           rust
 Version:        1.17.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and ISC and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -339,20 +339,28 @@ export RUSTFLAGS="%{rustflags}"
 
 DESTDIR=%{buildroot} ./x.py dist --install
 
-# The libdir libraries are identical to those under rustlib/, and we need
-# the latter in place to support dynamic linking for compiler plugins, so we'll
-# point ldconfig to rustlib/ and remove the former.
-%global rust_ldconfig %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-mkdir -p %{buildroot}$(dirname %{rust_ldconfig})
-echo "%{rustlibdir}/%{rust_triple}/lib" > %{buildroot}%{rust_ldconfig}
-rm -v %{buildroot}%{common_libdir}/*.so
+
+# Make sure the shared libraries are in the proper libdir
+%if "%{_libdir}" != "%{common_libdir}"
+mkdir -p %{buildroot}%{_libdir}
+find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \
+  -exec mv -v -t %{buildroot}%{_libdir} '{}' '+'
+%endif
+
+# The shared libraries should be executable for debuginfo extraction.
+find %{buildroot}%{_libdir} -maxdepth 1 -type f -name '*.so' \
+  -exec chmod -v +x '{}' '+'
+
+# The libdir libraries are identical to those under rustlib/.  It's easier on
+# library loading if we keep them in libdir, but we do need them in rustlib/
+# to support dynamic linking for compiler plugins, so we'll symlink.
+(cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" &&
+ find ../../../../%{_lib} -maxdepth 1 -name '*.so' \
+   -exec ln -v -f -s -t . '{}' '+')
 
 # Remove installer artifacts (manifests, uninstall scripts, etc.)
 find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'
 
-# The shared libraries should be executable for debuginfo extraction.
-find %{buildroot}%{rustlibdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+'
-
 # FIXME: __os_install_post will strip the rlibs
 # -- should we find a way to preserve debuginfo?
 
@@ -391,13 +399,13 @@ export RUSTFLAGS="%{rustflags}"
 %doc README.md
 %{_bindir}/rustc
 %{_bindir}/rustdoc
+%{_libdir}/*.so
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
 %dir %{rustlibdir}
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.so
-%{rust_ldconfig}
 
 
 %files std-static
@@ -438,6 +446,9 @@ export RUSTFLAGS="%{rustflags}"
 
 
 %changelog
+* Mon May 08 2017 Josh Stone <jistone@redhat.com> - 1.17.0-2
+- Move shared libraries back to libdir and symlink in rustlib
+
 * Thu Apr 27 2017 Josh Stone <jistone@redhat.com> - 1.17.0-1
 - Update to 1.17.0.