Hello community, here is the log from the commit of package dealii for openSUSE:Factory checked in at 2020-08-21 19:04:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dealii (Old) and /work/SRC/openSUSE:Factory/.dealii.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dealii" Fri Aug 21 19:04:02 2020 rev:2 rq:828066 version:9.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dealii/dealii.changes 2020-07-07 12:57:42.129622781 +0200 +++ /work/SRC/openSUSE:Factory/.dealii.new.3399/dealii.changes 2020-08-21 19:04:46.768377673 +0200 @@ -1,0 +2,13 @@ +Mon Aug 17 08:50:56 UTC 2020 - Michel Normand <norm...@linux.vnet.ibm.com> + +- for ppc64 (BE) increase memlim from 2k to 3k in spec file + to avoid build failure in OBS. + +------------------------------------------------------------------- +Tue Jul 7 12:13:27 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Add dealii-build-with-muparser-2.3.2.patch: Fix muparser 2.3.2 + version detection and thus build (gh#dealii/dealii#10548). +- Drop Group tags. + +------------------------------------------------------------------- New: ---- dealii-build-with-muparser-2.3.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dealii.spec ++++++ --- /var/tmp/diff_new_pack.uQdp3Z/_old 2020-08-21 19:04:49.380379225 +0200 +++ /var/tmp/diff_new_pack.uQdp3Z/_new 2020-08-21 19:04:49.384379227 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %define __builder ninja @@ -67,12 +68,14 @@ %define shlib_debug libdeal_II_g%{shlibver}%{?my_suffix} # /SECTION +%define memlim 2000 # LTO CAUSES aarch64 BUILDS TO TIME OUT; IT ALSO REQUIRES ~4GB PER THREAD %ifarch aarch64 %define _lto_cflags %{nil} %define memlim 4000 -%else -%define memlim 2000 +%endif +%ifarch ppc64 +%define memlim 3000 %endif Name: %{pname} @@ -80,9 +83,10 @@ Release: 0 Summary: A Finite Element Differential Equations Analysis Library License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ URL: https://www.dealii.org/ Source0: https://github.com/dealii/dealii/releases/download/v%{version}/%{srcname}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM dealii-build-with-muparser-2.3.2.patch gh#dealii/dealii#10548 badshah...@gmail.com -- Fix muparser 2.3.2 version detection +Patch0: dealii-build-with-muparser-2.3.2.patch # NOTE: serial arpack-ng even if parpack is available (see gh#dealii/dealii#10197) BuildRequires: arpack-ng-devel BuildRequires: blas-devel @@ -116,10 +120,10 @@ BuildRequires: fdupes %endif %if %{with mpi} -BuildRequires: parpack%{my_suffix}-devel -BuildRequires: scalapack%{my_suffix}-devel BuildRequires: %{mpi_flavor}%{?mpi_vers}-config BuildRequires: %{mpi_flavor}%{?mpi_vers}-devel +BuildRequires: parpack%{my_suffix}-devel +BuildRequires: scalapack%{my_suffix}-devel %endif %if %{with python} BuildRequires: libboost_python3-devel @@ -134,7 +138,6 @@ %package -n %{shlib} Summary: A generic C++ finite element library -Group: System/Libraries %description -n %{shlib} deal.II is a C++ program library targeted at the computational solution of @@ -144,7 +147,6 @@ %package -n deal_II%{?my_suffix}-devel Summary: Development files for %{name} -Group: Development/Libraries/C and C++ Requires: %{shlib} = %{version} Provides: %{name}%{?my_suffix}-devel = %{version} ++++++ dealii-build-with-muparser-2.3.2.patch ++++++ >From 0c3c5302dcf82c866d2febdab574d8b185393f9c Mon Sep 17 00:00:00 2001 From: David Wells <drwe...@email.unc.edu> Date: Thu, 18 Jun 2020 17:28:48 -0400 Subject: [PATCH] Fix detection of muParser 2.3.2. --- cmake/modules/FindMUPARSER.cmake | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindMUPARSER.cmake b/cmake/modules/FindMUPARSER.cmake index 7f4066adb04..771d6ff5e89 100644 --- a/cmake/modules/FindMUPARSER.cmake +++ b/cmake/modules/FindMUPARSER.cmake @@ -42,9 +42,22 @@ DEAL_II_FIND_PATH(MUPARSER_INCLUDE_DIR muParserDef.h IF(EXISTS ${MUPARSER_INCLUDE_DIR}/muParserDef.h) FILE(STRINGS "${MUPARSER_INCLUDE_DIR}/muParserDef.h" MUPARSER_VERSION_STRING_LINE + # Try to match the line + # + # #define MUP_VERSION _T("2.2.4") REGEX "#define MUP_VERSION _T" ) - + + IF("${MUPARSER_VERSION_STRING_LINE}" STREQUAL "") + # try again with the newer version format (starting in at least 2.3.2), + # which matches the line + # + # static const string_type ParserVersion = string_type(_T("2.3.2")); + FILE(STRINGS "${MUPARSER_INCLUDE_DIR}/muParserDef.h" MUPARSER_VERSION_STRING_LINE + REGEX "string_type ParserVersion = string_type" + ) + ENDIF() + STRING(REGEX REPLACE ".*\"(.*)\".*" "\\1" _VERSION_STRING "${MUPARSER_VERSION_STRING_LINE}" )
