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=973d28....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit c70c667d3422b2a66690417a64ba021ac82ceade
Author: sergesanspaille <sguelton(a)redhat.com>
Date: Mon Jul 27 12:47:26 2020 +0000
10.0.1
diff --git a/.gitignore b/.gitignore
index fefea7d..676af31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,6 @@
/compiler-rt-10.0.0rc6.src.tar.xz.sig
/compiler-rt-10.0.0.src.tar.xz
/compiler-rt-10.0.0.src.tar.xz.sig
+/compiler-rt-10.0.1.src.tar.xz
+/compiler-rt-10.0.1.src.tar.xz.sig
+/hans-gpg-key.asc
diff --git a/compiler-rt.spec b/compiler-rt.spec
index c5509e0..92a437a 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -4,7 +4,7 @@
%endif
#%%global rc_ver 6
-%global baserelease 0
+%global baserelease 1
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
@@ -15,7 +15,7 @@
%global optflags %(echo %{optflags} -Dasm=__asm__)
Name: compiler-rt
-Version: 10.0.0
+Version: 10.0.1
Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
Summary: LLVM "compiler-rt" runtime libraries
@@ -113,6 +113,9 @@ popd
%endif
%changelog
+* Mon Jul 27 2020 sguelton(a)redhat.com - 10.0.0-1
+- 10.0.1
+
* Fri Apr 3 2020 sguelton(a)redhat.com - 10.0.0-1
- 10.0.0 final
diff --git a/hans-gpg-key.asc b/hans-gpg-key.asc
deleted file mode 100644
index 4b3cdde..0000000
--- a/hans-gpg-key.asc
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-67H2IH//2sf8dw==
-=ADVe
------END PGP PUBLIC KEY BLOCK-----
diff --git a/sources b/sources
index e9f85b5..e15edd2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (compiler-rt-10.0.0.src.tar.xz) =
c4a25d1e922a051c78255aec9fd525acbbcaa62cc53161ed6979b21a0d91301d3c2c07ca1b6460f1c4d6656c29373ff0c20d5496955ed0a0b26d7eebbf159ec4
-SHA512 (compiler-rt-10.0.0.src.tar.xz.sig) =
650c1428399e26772b2e5200f69fce6d800bd4a023e3daa0d177b7ddf58d9749fac3ae6423bce43834966f0049194b9eaf120b604dd2b1ac0c089608df7b5cba
+SHA512 (compiler-rt-10.0.1.src.tar.xz) =
a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b
+SHA512 (compiler-rt-10.0.1.src.tar.xz.sig) =
18f9b09a66cfe187cb6dc04cca4465c78756c90e31bfb236da5414336f16a25b9f80de1a3938dbe490f68cbbe924047fbef4f1787bddf96dc5ed8f67ec658fa7
+SHA512 (hans-gpg-key.asc) =
dc481fe1fe8ffcf5f7853b346739e4c9f7f2447e6e2752447babb520240d769559e767d732b7943dfed4f971d17cccefd7a00cb4e0a9d39c5215859226998519
commit 973d28bac295d08e45f0a56235ae669ca5c1e45d
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 3cc4965..c5509e0 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -4,7 +4,7 @@
%endif
#%%global rc_ver 6
-%global baserelease 1
+%global baserelease 0
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
@@ -86,35 +86,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