diff --git a/adolc.changes b/adolc.changes index 5bdb2bf..b431ffa 100644 --- a/adolc.changes +++ b/adolc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 7 13:18:20 UTC 2022 - Dirk Müller + +- add handle-lib64-for-riscv64.patch + ------------------------------------------------------------------- Fri Jul 24 21:47:06 UTC 2020 - Matthias Eliasson diff --git a/adolc.spec b/adolc.spec index 35e943e..070c879 100644 --- a/adolc.spec +++ b/adolc.spec @@ -1,7 +1,7 @@ # # spec file for package adolc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,10 +21,12 @@ Name: adolc Version: 2.7.2 Release: 0 Summary: Algorithmic Differentiation Library for C/C++ -License: GPL-2.0-or-later OR EPL-1.0 +License: EPL-1.0 OR GPL-2.0-or-later URL: https://github.com/coin-or/ADOL-C Source0: https://github.com/coin-or/ADOL-C/archive/releases/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf +# from https://github.com/coin-or/ADOL-C/pull/47.patch +Patch1: handle-lib64-for-riscv64.patch BuildRequires: ColPack-devel BuildRequires: gcc-c++ BuildRequires: libstdc++-devel @@ -73,7 +75,7 @@ BuildArch: noarch This package provides the user's manual for ADOL-C. %prep -%autosetup -n ADOL-C-releases-%{version} +%autosetup -p1 -n ADOL-C-releases-%{version} %build # autoreconf -v --install --force diff --git a/handle-lib64-for-riscv64.patch b/handle-lib64-for-riscv64.patch new file mode 100644 index 0000000..33730f6 --- /dev/null +++ b/handle-lib64-for-riscv64.patch @@ -0,0 +1,35 @@ +From 75ef7aee090d3704c8c6dbabf606b220f1834c5b Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Fri, 7 Oct 2022 15:12:11 +0200 +Subject: [PATCH] Add RISCV-64 to the list of 64bit architectures + +--- + autoconf/ax_boost_base.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: ADOL-C-releases-2.7.2/autoconf/ax_boost_base.m4 +=================================================================== +--- ADOL-C-releases-2.7.2.orig/autoconf/ax_boost_base.m4 ++++ ADOL-C-releases-2.7.2/autoconf/ax_boost_base.m4 +@@ -95,7 +95,7 @@ if test "x$want_boost" = "xyes"; then + x86_64) + libsubdirs="lib64 libx32 lib lib64" + ;; +- ppc64|s390x|sparc64|aarch64|ppc64le) ++ ppc64|s390x|sparc64|aarch64|ppc64le|riscv64) + libsubdirs="lib64 lib lib64 ppc64le" + ;; + esac +Index: ADOL-C-releases-2.7.2/configure +=================================================================== +--- ADOL-C-releases-2.7.2.orig/configure ++++ ADOL-C-releases-2.7.2/configure +@@ -18369,7 +18369,7 @@ $as_echo_n "checking for boostlib >= $bo + x86_64) + libsubdirs="lib64 libx32 lib lib64" + ;; +- ppc64|s390x|sparc64|aarch64|ppc64le) ++ ppc64|s390x|sparc64|aarch64|ppc64le|riscv64) + libsubdirs="lib64 lib lib64 ppc64le" + ;; + esac