The package rpms/scorep.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/scorep.git/commit/?id=e14a890f842...
https://src.fedoraproject.org/cgit/rpms/scorep.git/commit/?id=d08d77d7153....
Change:
+%ifarch aarch64
-%ifarch aarch64
Thanks.
Full change:
============
commit d08d77d7153e5a1143d56a32d909e5130f606d29
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Tue Mar 3 12:46:03 2020 +0000
Fix libunwind build; avoid aarch64 oshm on el8 too
diff --git a/scorep.spec b/scorep.spec
index 81b966d..ccdb0af 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -4,14 +4,12 @@
# OMPI4 oshcc is now not on all arches (depending on UCX)
%global oshm 1
-%if 0%{?fedora} > 30
-%ifnarch aarch64 ppc64le x86_64
+# Fixme: There's something odd here, since aarch64 has the oshm compilers
+%if 0%{?fedora} > 30 || 0%{?el8}
+%ifnarch ppc64le x86_64
%global oshm 0
%endif
%endif
-%ifarch aarch64
-%{?el8:%global oshm 0}
-%endif
%global libuwcommit 5646a9b520c51bf6aaa86ae4c25289e30b7c3a41
%global libuwshort %(c=%{libuwcommit}; echo ${c:0:7})
@@ -237,15 +235,15 @@ tar fx %SOURCE1
%build
%global _configure ../configure
-# pushd libunwind*
-# # Per Fedora packaging
-# sed -i 's/= UNW_ARM_METHOD_ALL/= UNW_ARM_METHOD_EXIDX/' src/arm/Gglobal.c
-# ./autogen.sh
-# CFLAGS="%build_cflags" LDFLAGS="%build_ldflags" \
-# ./configure --prefix=$(pwd)/unwind --enable-static --disable-dynamic
-# %make_build -k
-# %make_install
-# popd
+pushd libunwind*
+# Per Fedora packaging
+sed -i 's/= UNW_ARM_METHOD_ALL/= UNW_ARM_METHOD_EXIDX/' src/arm/Gglobal.c
+./autogen.sh
+CFLAGS="%build_cflags -fcommon" LDFLAGS="%build_ldflags" \
+ ./configure --prefix=$(pwd)/unwind --enable-static --disable-dynamic
+%make_build -k
+%make_install
+popd
# See above
PATH=$(pwd)/bin:$PATH
%global configure_opts --enable-shared --disable-static --disable-silent-rules
--with-unwind=$(pwd)/unwind
@@ -270,7 +268,6 @@ do
%else
module load mpi/$mpi-%{_arch}
%endif
- ln -s ../configure .
%configure %{configure_opts} \
--libdir=%{_libdir}/$mpi/lib \
--bindir=%{_libdir}/$mpi/bin \
@@ -463,7 +460,7 @@ make -C serial check V=1
* Wed Feb 26 2020 Dave love <loveshack(a)fedoraproject.org> - 6.0-7
- Bundle the recommended modified libunwind
- Fix FTBFS with binutils 2.34
-- Don't try to build oshm on el8 aarch64
+- Avoid oshm on el8/fedora aarch64
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit e14a890f8422bb8cb1410bf766b849e5a1306e93
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Wed Feb 26 17:51:52 2020 +0000
- Bundle the recommended modified libunwind
- Fix FTBFS with binutils 2.34
- Don't try to build oshm on el8 aarch64
diff --git a/scorep.spec b/scorep.spec
index 10e24b7..81b966d 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -9,6 +9,9 @@
%global oshm 0
%endif
%endif
+%ifarch aarch64
+%{?el8:%global oshm 0}
+%endif
%global libuwcommit 5646a9b520c51bf6aaa86ae4c25289e30b7c3a41
%global libuwshort %(c=%{libuwcommit}; echo ${c:0:7})
@@ -457,9 +460,10 @@ make -C serial check V=1
%changelog
-* Mon Feb 24 2020 Dave love <loveshack(a)fedoraproject.org> - 6.0-7
+* Wed Feb 26 2020 Dave love <loveshack(a)fedoraproject.org> - 6.0-7
- Bundle the recommended modified libunwind
- Fix FTBFS with binutils 2.34
+- Don't try to build oshm on el8 aarch64
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild