The package rpms/compiler-rt.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/compiler-rt.git/commit/?id=d0c80c....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit d0c80cfd621bab5cff460049bf749251050bba70
Author: sergesanspaille <sguelton(a)redhat.com>
Date: Wed Jul 15 12:04:54 2020 +0000
Fix multilib runtime links, see rhbz#1855379
diff --git a/compiler-rt.spec b/compiler-rt.spec
index 259e0b2..b4c08ff 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -4,7 +4,7 @@
%endif
#%%global rc_ver 6
-%global baserelease 4
+%global baserelease 5
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
@@ -90,35 +90,21 @@ 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
+# multilib support: also create symlink from lib to lib64, fixes rhbz#1678240
+# the symlinks will be dangling if the 32 bits version is not installed, but that should
be fine
+%ifarch x86_64
+mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{version}/lib/linux
+for i in *.a *.so
+do
+ target=`echo "$i" | sed -e 's/x86_64/i386/'`
+ ln -s ../../../../../lib/clang/%{version}/lib/$target
../../../../%{_lib}/clang/%{version}/lib/linux/
+done
+
%endif
+
+popd
%check
#make check-all -C _build
@@ -131,6 +117,9 @@ fi
%endif
%changelog
+* Wed Jul 15 2020 sguelton(a)redhat.com - 10.0.0-5
+- Fix multilib runtime links, see rhbz#1855379
+
* Wed Jul 15 2020 sguelton(a)redhat.com - 10.0.0-4
- Correctly use gpg verification