commit dealii for openSUSE:Factory
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.changes2020-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 + +- 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 + +- 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 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 "${MUP
commit dealii for openSUSE:Factory
Hello community, here is the log from the commit of package dealii for openSUSE:Factory checked in at 2020-07-07 12:57:24 Comparing /work/SRC/openSUSE:Factory/dealii (Old) and /work/SRC/openSUSE:Factory/.dealii.new.3060 (New) Package is "dealii" Tue Jul 7 12:57:24 2020 rev:1 rq:811230 version:9.2.0 Changes: New Changes file: --- /dev/null 2020-06-25 10:56:43.568241769 +0200 +++ /work/SRC/openSUSE:Factory/.dealii.new.3060/dealii.changes 2020-07-07 12:57:42.129622781 +0200 @@ -0,0 +1,106 @@ +--- +Wed Jun 3 19:22:21 UTC 2020 - Jan Engelhardt + +- Trim conjecture from description. +- Trim double "library" in summary. + +--- +Sun May 31 14:19:39 UTC 2020 - Atri Bhattacharya + +- Update to version 9.2.0: see + https://www.dealii.org/developer/doxygen/deal.II/changes_between_9_1_1_and_9_2_0.html +- Drop patches commited upstream: + * dealii-find-parpack-independently-of-arpack.patch + * dealii-tbb-version-check.patch +- Set up spec file for enabling python bindings later, when + gh#dealii/dealii#10423 is fixed; disable building the bindings + themselves using bcond_with. +- Pass DEAL_II_COMPILE_EXAMPLES=OFF to cmake to prevent compiling + the examples and generating binaries which are then installed to + %_docdir. +- Disable Link-Time-Optimization for aarch64 to prevent builds + from from failing due to linking taking too long and OBS + shutting down the worker assuming a stuck job. +- Update _constraints file to ensure enough physical memory in + build worker to prevent swapping (which slows down and + eventually times out the build): + * aarch64: 4 GB (these runs don't time out, so it's okay to have +a lower memory requirement than for x86_64). + * x86_64: 7 GB. +- For aarch64, require at least 4000M per thread for compilation. + +--- +Sun May 10 02:25:04 UTC 2020 - Atri Bhattacharya + +- Update to version 9.1.1: + * Fixed a compatibility bug in GridIn::read_msh with older gmsh +mesh format files. +- Changes from version 9.1.0: see + https://www.dealii.org/developer/doxygen/deal.II/changes_between_9_0_1_and_9_1_0.html. +- Changes from version 9.0.0: see + https://www.dealii.org/developer/doxygen/deal.II/changes_between_8_5_0_and_9_0_0.html. +- Implement multibuild for openmpi2, openmpi3, and serial + flavours (openmpi1 not supported by dealii). +- Add dealii-tbb-version-check.patch to detect correct version + of TBB; patch taken from upstream [gh#dealii/dealii#9475]. +- Add dealii-find-parpack-independently-of-arpack.patch to detect + parpack independently of arpack's location; patch taken from + upstream pull request [gh#dealii/dealii#10197]. Note that *both* + arpack and parpack are required when building with MPI enabled. +- Use deal_II*-devel as the devel pkg name to be consistent with + shared lib packaging policy; add Provides: dealii*-devel to help + with upgrade. +- Use ninja for build (BuildRequires: ninja). +- Use memory_constraints to require per-thread memory >= 2 GB; + introduces BuildRequires: memory-constraints. +- Use %cmake_build instead of running make. +- Update cmake options in keeping with upstream changes. +- Add _constraints file to limit builds to at least 2 GB memory, + anything less causes out-of-memory problems. +- Update License tag: dealii is now licensed as LGPL-2.1-or-later. +- Remove hashbangs from non-executable files. +- Link duplicate files in %{_docdir}. +- Disable builds on i586 as linking takes too long leading to OBS + worker assuming a "stuck job" and killing the VM. +- Disable building documentation for openSUSE 15.1 as it fails. + +--- +Tue Nov 21 20:34:40 UTC 2017 - jungh...@votca.org + +- Update to version 8.5.1: Only build fixes + https://github.com/dealii/dealii/compare/v8.5.0...v8.5.1 +- Drop dealii-boost-1_64.patch, got merged upstream + +--- +Wed Aug 9 08:38:19 UTC 2017 - badshah...@gmail.com + +- Update to version 8.5.0: See + http://www.dealii.org/8.5.0/doxygen/deal.II/changes_between_8_4_2_and_8_5_0.html + for the list of changes (too many to list here). +- Add dealii-boost-1_64.patch: Fix compilation against boost 1.64; + patch taken from upstream git (gh#dealii/dealii#4309). +- Move documentation files installed to non-standard locations to + standard docdir. +- Package cmake files and data files in -devel package. + +--- +Mon Jan 18 14:33:35 UTC 2016 - kkhere@gmail.com + +- add missing library file libtbb.so* to rpm, otherwise we get + missing dependency wh