Fix rhbz#1678240

.gitignore

@@ -20,3 +20,7 @@
 /compiler-rt-7.0.0.src.tar.xz
 /compiler-rt-7.0.1.src.tar.xz
 /compiler-rt-8.0.0rc1.src.tar.xz
+/compiler-rt-8.0.0rc2.src.tar.xz
+/compiler-rt-8.0.0rc3.src.tar.xz
+/compiler-rt-8.0.0rc4.src.tar.xz
+/compiler-rt-8.0.0.src.tar.xz

compiler-rt.spec

@@ -3,13 +3,13 @@
 %global debug_package %{nil}
 %endif
 
-%global rc_ver 1
+#%%global rc_ver 4
 
 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
 Name:		compiler-rt
 Version:	8.0.0
-Release:	1%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Release:	2%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
@@ -73,9 +73,39 @@ done
 mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/
 pushd %{buildroot}%{_libdir}/clang/%{version}/lib
-for i in *.a *.syms *.so; do
+for i in *.a *.so
+do
 	ln -s ../$i linux/$i
 done
+popd
+
+# multilib support: also create symlink from lib to lib64
+# fixes rhbz#1678240
+%ifarch %{ix86}
+%post
+if test "`uname -m`" = x86_64
+then
+	cd %{_libdir}/clang/%{version}/lib
+	mkdir -p ../../../../lib64/clang/%{version}/lib
+	for i in *.a *.so
+	do
+		ln -s ../../../../%{_lib}/clang/%{version}/lib/$i ../../../../lib64/clang/%{version}/lib/$i
+	done
+fi
+
+%preun
+
+if test "`uname -m`" = x86_64
+then
+	cd %{_libdir}/clang/%{version}/lib
+	for i in *.a *.so
+	do
+		rm ../../../../lib64/clang/%{version}/lib/$i
+	done
+	rmdir -p ../../../../lib64/clang/%{version}/lib 2>/dev/null 1>/dev/null || :
+fi
+
+%endif
 
 %check
 #make check-all -C _build
@@ -85,6 +115,12 @@ done
 %{_libdir}/clang/%{version}
 
 %changelog
+* Tue Jun 18 2019 sguelton@redhat.com - 8.0.0-2
+- Fix rhbz#1678240
+
+* Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1
+- 8.0.0 final
+
 * Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-1.rc1
 - 8.0.0 Release candidate 1
 

sources

@@ -1 +1 @@
-SHA512 (compiler-rt-8.0.0rc1.src.tar.xz) = 2e32da6de8e62bf64144adcbc2deb4bc55ab3f5b085d1d9802f2137435123893140c91b8815bbeb34e178efdee4033a4bf222bf8a655c09498b0e8f10218dbc5
+SHA512 (compiler-rt-8.0.0.src.tar.xz) = fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913