rpm/python3-espressomd
SHA256
1
0
Fork 0
forked from pool/python3-espressomd
Code Pull Requests Activity

- Give up on building on 32bit architectures (gh#espressomd/espresso#4537).

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=35
This commit is contained in:
Matej Cepl 2022-07-20 21:36:44 +00:00 committed by Git OBS Bridge
parent 7c94d1947e
commit 2afb0d8fe5
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix-integral-size-32bit.patch
View File

@ -1,26 +0,0 @@
From 8182bb208e31cf9244dd3e6f567d3e27a33c973e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad@icp.uni-stuttgart.de>
Date: Wed, 20 Jul 2022 21:25:34 +0200
Subject: [PATCH] tests: Fix integral size on 32bit archs
---
src/utils/tests/integral_parameter_test.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/src/utils/tests/integral_parameter_test.cpp
+++ b/src/utils/tests/integral_parameter_test.cpp
@@ -38,11 +38,11 @@ BOOST_AUTO_TEST_CASE(integral_parameter_
std::pair<std::size_t, int>>::value,
"");
- BOOST_CHECK(std::make_pair(1ul, 13) ==
+ BOOST_CHECK(std::make_pair(std::size_t{1u}, 13) ==
(Utils::integral_parameter<F, 1, 5>(1, 13)));
- BOOST_CHECK(std::make_pair(3ul, 13) ==
+ BOOST_CHECK(std::make_pair(std::size_t{3u}, 13) ==
(Utils::integral_parameter<F, 1, 5>(3, 13)));
- BOOST_CHECK(std::make_pair(5ul, 13) ==
+ BOOST_CHECK(std::make_pair(std::size_t{5u}, 13) ==
(Utils::integral_parameter<F, 1, 5>(5, 13)));
BOOST_CHECK_THROW((Utils::integral_parameter<F, 1, 5>(6, 13)),
std::exception);

3
python3-espressomd.changes
View File

@ -65,8 +65,7 @@ Tue Jul 19 19:40:59 UTC 2022 - Matej Cepl <mcepl@suse.com>
interactive Python session (#3751). interactive Python session (#3751).
* MDAnalysis integration now provides bond information * MDAnalysis integration now provides bond information
(#3801). (#3801).
- Add fix-integral-size-32bit.patch to fix build on 32bit arch - Give up on building on 32bit architectures (gh#espressomd/espresso#4537).
(gh#espressomd/espresso#4537).
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 16 00:24:21 UTC 2022 - Jean-Noel Grad <jgrad@icp.uni-stuttgart.de> Sat Apr 16 00:24:21 UTC 2022 - Jean-Noel Grad <jgrad@icp.uni-stuttgart.de>

6
python3-espressomd.spec
View File

@ -50,10 +50,8 @@ Patch1: missing_size_t.patch
Patch2: hdf5.patch Patch2: hdf5.patch
# PATCH-FIX-OPENSUSE rpath.patch boo#1198352 # PATCH-FIX-OPENSUSE rpath.patch boo#1198352
Patch3: rpath.patch Patch3: rpath.patch
# PATCH-FIX-UPSTREAM fix-integral-size-32bit.patch gh#espressomd/espresso#4537 mcepl@suse.com # According to gh#espressomd/espresso#4537 32bit architectures are not supported any more
# fix building on 32bit arch ExcludeArch: %{ix86}
# THIS IS QUESTIONABLE, because upstream officially doesn't support 32bit archs any more
Patch4: fix-integral-size-32bit.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fftw3-devel BuildRequires: fftw3-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++