From 2afb0d8fe507ca752590340ccb7e9a216bd4ed43fd6bb195868b98bfcff08c8c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 20 Jul 2022 21:36:44 +0000 Subject: [PATCH] - Give up on building on 32bit architectures (gh#espressomd/espresso#4537). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=35 --- fix-integral-size-32bit.patch | 26 -------------------------- python3-espressomd.changes | 3 +-- python3-espressomd.spec | 6 ++---- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 fix-integral-size-32bit.patch diff --git a/fix-integral-size-32bit.patch b/fix-integral-size-32bit.patch deleted file mode 100644 index 03fc9e0..0000000 --- a/fix-integral-size-32bit.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8182bb208e31cf9244dd3e6f567d3e27a33c973e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= -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>::value, - ""); - -- BOOST_CHECK(std::make_pair(1ul, 13) == -+ BOOST_CHECK(std::make_pair(std::size_t{1u}, 13) == - (Utils::integral_parameter(1, 13))); -- BOOST_CHECK(std::make_pair(3ul, 13) == -+ BOOST_CHECK(std::make_pair(std::size_t{3u}, 13) == - (Utils::integral_parameter(3, 13))); -- BOOST_CHECK(std::make_pair(5ul, 13) == -+ BOOST_CHECK(std::make_pair(std::size_t{5u}, 13) == - (Utils::integral_parameter(5, 13))); - BOOST_CHECK_THROW((Utils::integral_parameter(6, 13)), - std::exception); diff --git a/python3-espressomd.changes b/python3-espressomd.changes index 51a076f..91f3f9a 100644 --- a/python3-espressomd.changes +++ b/python3-espressomd.changes @@ -65,8 +65,7 @@ Tue Jul 19 19:40:59 UTC 2022 - Matej Cepl interactive Python session (#3751). * MDAnalysis integration now provides bond information (#3801). -- Add fix-integral-size-32bit.patch to fix build on 32bit arch - (gh#espressomd/espresso#4537). +- Give up on building on 32bit architectures (gh#espressomd/espresso#4537). ------------------------------------------------------------------- Sat Apr 16 00:24:21 UTC 2022 - Jean-Noel Grad diff --git a/python3-espressomd.spec b/python3-espressomd.spec index 566eb97..cde412d 100644 --- a/python3-espressomd.spec +++ b/python3-espressomd.spec @@ -50,10 +50,8 @@ Patch1: missing_size_t.patch Patch2: hdf5.patch # PATCH-FIX-OPENSUSE rpath.patch boo#1198352 Patch3: rpath.patch -# PATCH-FIX-UPSTREAM fix-integral-size-32bit.patch gh#espressomd/espresso#4537 mcepl@suse.com -# fix building on 32bit arch -# THIS IS QUESTIONABLE, because upstream officially doesn't support 32bit archs any more -Patch4: fix-integral-size-32bit.patch +# According to gh#espressomd/espresso#4537 32bit architectures are not supported any more +ExcludeArch: %{ix86} BuildRequires: cmake BuildRequires: fftw3-devel BuildRequires: gcc-c++