The package rpms/ergo.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/ergo.git/commit/?id=5267b7510ac65...
https://src.fedoraproject.org/cgit/rpms/ergo.git/commit/?id=d782fb7b407d9....
Change:
-%ifarch %ix86 x86_64
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
Thanks.
Full change:
============
commit d782fb7b407d9f4db075eea3df1ee6281ce52f62
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 21:06:59 2018 +0200
Don't use openblas on s390x as linear algebra tests fail.
diff --git a/ergo.spec b/ergo.spec
index 823498a..2d41d8e 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -7,8 +7,9 @@ License: GPLv3+
URL:
http://www.ergoscf.org
Source0:
http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
-# What architectures is OpenBLAS available on?
-%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+# What architectures is OpenBLAS available on? (s390x disabled since tests fail)
+#ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
%global openblas 1
%else
%global openblas 0
commit c70279c1f54c902c5a2198f87151ab44c6bbbdfc
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 20:55:25 2018 +0200
Missed the -Wp, part.
diff --git a/ergo.spec b/ergo.spec
index 163df04..823498a 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -73,7 +73,7 @@ export CC=gcc
export F77=gfortran
# Use OpenMP parallellization
-export CFLAGS=$(echo "%{optflags} -fopenmp" | sed
"s|-D_GLIBCXX_ASSERTIONS||g")
+export CFLAGS=$(echo "%{optflags} -fopenmp" | sed
"s|-Wp,-D_GLIBCXX_ASSERTIONS||g")
export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
commit 2af8d9fed51b02e959a49b19fbb2ad182c48c051
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Mon Jun 25 20:49:11 2018 +0200
Turn off GLIBC++ hardening which breaks the program.
diff --git a/ergo.spec b/ergo.spec
index e4a7650..163df04 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -73,7 +73,7 @@ export CC=gcc
export F77=gfortran
# Use OpenMP parallellization
-export CFLAGS="%{optflags} -fopenmp"
+export CFLAGS=$(echo "%{optflags} -fopenmp" | sed
"s|-D_GLIBCXX_ASSERTIONS||g")
export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
commit b4b2fd66d1e97e8709c6eca0e340c15a282aff69
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat Jun 23 15:50:35 2018 +0200
Fix FTBFS.
diff --git a/ergo.spec b/ergo.spec
index 4d1f538..e4a7650 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -113,7 +113,8 @@ make check VERBOSE=1
%files
%defattr(-,root,root,-)
-%doc ChangeLog COPYING README ergo_license_long.txt ergo_release_notes*
+%license COPYING ergo_license_long.txt
+%doc README ergo_release_notes*
%{_bindir}/ergo
%{_datadir}/%{name}
@@ -122,7 +123,7 @@ make check VERBOSE=1
%doc COPYING documentation/html/*
%changelog
-* Sat May 05 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
+* Sat Jun 23 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
- Fix FTBFS.
* Wed Feb 28 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-1
commit 04801027e8cdac2899394f22d10e8acf35d3cbd3
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat May 5 21:10:59 2018 +0200
Minor clenaup
diff --git a/ergo.spec b/ergo.spec
index 8a8a3e2..4d1f538 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -78,10 +78,11 @@ export CXXFLAGS="${CFLAGS}"
export FFLAGS="${CFLAGS}"
# Linker flags
-export LDFLAGS="-L%{_libdir}/atlas -fopenmp"
%if %{openblas}
export LIBS="-lopenblaso"
%else
+# OpenBLAS is not available; use ATLAS
+export LDFLAGS="-L%{_libdir}/atlas"
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
export LIBS="-lsatlas"
%else
commit 5267b7510ac652040741eb3826252e0500ac8c3a
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Sat May 5 12:53:50 2018 +0200
Fix FTBFS.
diff --git a/ergo.spec b/ergo.spec
index 3486a40..8a8a3e2 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -1,14 +1,20 @@
Name: ergo
Version: 3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A program for large-scale self-consistent field calculations
-
Group: Applications/Engineering
License: GPLv3+
URL:
http://www.ergoscf.org
Source0:
http://ergoscf.org/source/tarfiles/ergo-%{version}.tar.gz
+# What architectures is OpenBLAS available on?
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64 s390x
+%global openblas 1
+%else
+%global openblas 0
+%endif
+
+%if %{openblas}
BuildRequires: openblas-devel
%else
BuildRequires: atlas-devel
@@ -73,7 +79,7 @@ export FFLAGS="${CFLAGS}"
# Linker flags
export LDFLAGS="-L%{_libdir}/atlas -fopenmp"
-%ifarch %ix86 x86_64
+%if %{openblas}
export LIBS="-lopenblaso"
%else
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
@@ -115,6 +121,9 @@ make check VERBOSE=1
%doc COPYING documentation/html/*
%changelog
+* Sat May 05 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-2
+- Fix FTBFS.
+
* Wed Feb 28 2018 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 3.6-1
- Added gcc-c++ buildrequires.
- Update to 3.6.
commit a90e9a8d834053e8e63aee9dc643886d1486d052
Author: Susi Lehtola <jussilehtola(a)fedoraproject.org>
Date: Wed Feb 28 16:37:17 2018 +0100
gcc is also required.
diff --git a/ergo.spec b/ergo.spec
index a3d8758..3486a40 100644
--- a/ergo.spec
+++ b/ergo.spec
@@ -14,6 +14,7 @@ BuildRequires: openblas-devel
BuildRequires: atlas-devel
%endif
+BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
BuildRequires: doxygen