Compare commits
6 Commits
e960f58b2e
...
94e6715adc
Author | SHA1 | Date |
---|---|---|
David Abdurachmanov | 94e6715adc | |
Antonio Trande | d7a51cf628 | |
Antonio Trande | 3fa107d2fe | |
Fedora Release Engineering | 810ce5d1a7 | |
Fedora Release Engineering | 9bc1591a1a | |
Florian Weimer | 2ced3af557 |
|
@ -0,0 +1,38 @@
|
|||
Avoid an implicit function declaration of amd_defaults, cholmod_start.
|
||||
Without this change, detection results change with compilers which do
|
||||
not support implicit function declarations. The fake prototypes match
|
||||
those that autoconf uses.
|
||||
|
||||
The source code for all the autoconf macros is not included here, so
|
||||
patch only the generated shell script.
|
||||
|
||||
This was solved upstream via:
|
||||
|
||||
commit fea612b2327ad347b6e8aba96ff33e87b98d10fb
|
||||
Author: Stefan Vigerske <svigerske@gams.com>
|
||||
Date: Fri Feb 26 06:08:27 2021 +0100
|
||||
|
||||
use CHK_LIBHDR macro for amd, cholesky, and (system-)mumps
|
||||
|
||||
diff --git a/Clp/configure b/Clp/configure
|
||||
index bdbfe60f2613c6c5..4d3a4b4f05a30b12 100755
|
||||
--- a/Clp/configure
|
||||
+++ b/Clp/configure
|
||||
@@ -23387,6 +23387,8 @@ cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
+char $fnm (void);
|
||||
+
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -23580,6 +23582,8 @@ cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
+char $fnm (void);
|
||||
+
|
||||
int
|
||||
main ()
|
||||
{
|
|
@ -0,0 +1,28 @@
|
|||
Avoid an implicit function declaration of exit. This is required for
|
||||
improved C99 compatibility. This was fixed long ago in autoconf,
|
||||
so there is no need to upstream this patch.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 67901384c6ef274c..edec9272070601a3 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2534,7 +2534,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
- '' \
|
||||
+ '#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
@@ -6926,8 +6926,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
|
@ -1,12 +1,12 @@
|
|||
%global module Clp
|
||||
|
||||
# Avoid circular dependencies on first build
|
||||
%bcond_with bootstrap
|
||||
%bcond_without bootstrap
|
||||
|
||||
Name: coin-or-%{module}
|
||||
Summary: Coin-or linear programming
|
||||
Version: 1.17.6
|
||||
Release: 10%{?dist}
|
||||
Release: 15.0.riscv64%{?dist}
|
||||
License: EPL-1.0
|
||||
URL: https://github.com/coin-or/%{module}
|
||||
Source0: %{url}/archive/releases/%{version}/%{module}-%{version}.tar.gz
|
||||
|
@ -47,6 +47,9 @@ Patch6: %{name}-signed.patch
|
|||
# Do not use the AVX2 instructions
|
||||
Patch7: %{name}-no-avx.patch
|
||||
|
||||
Patch8: coin-or-Clp-configure-c99.patch
|
||||
Patch9: coin-or-Clp-configure-amd_defaults-c99.patch
|
||||
|
||||
%description
|
||||
Clp (Coin-or linear programming) is an open-source linear programming
|
||||
solver written in C++. It is primarily meant to be used as a callable
|
||||
|
@ -76,16 +79,18 @@ This package contains the documentation for %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{module}-releases-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch -P 0 -p1
|
||||
%patch -P 1 -p1
|
||||
%if %{without bootstrap}
|
||||
%patch2 -p1
|
||||
%patch -P 2 -p1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
%patch -P 6 -p1
|
||||
%patch -P 7 -p1
|
||||
%patch -P 8 -p1
|
||||
%patch -P 9 -p1
|
||||
|
||||
%build
|
||||
%if %{without bootstrap}
|
||||
|
@ -154,6 +159,24 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
|
|||
%{_docdir}/%{name}/clp_doxy.tag
|
||||
|
||||
%changelog
|
||||
* Tue Jan 09 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1.17.6-15.0.riscv64
|
||||
- Bootstrap (riscv64)
|
||||
|
||||
* Sat Jan 06 2024 Antonio Trande <sagitter@fedoraproject.org> - 1.17.6-15
|
||||
- Rebuild for MUMPS-5.6.2 (disable bootstrap)
|
||||
|
||||
* Sat Jan 06 2024 Antonio Trande <sagitter@fedoraproject.org> - 1.17.6-14
|
||||
- Rebuild for MUMPS-5.6.2
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.6-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.6-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2023 Florian Weimer <fweimer@redhat.com> - 1.17.6-11
|
||||
- Port configure script to C99
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.6-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue