commit: f48b9d918fc0fc05f725df394b2d7208a793cf4c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Feb 28 07:00:38 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Mar 1 23:27:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48b9d91
sci-libs/dealii: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../dealii/files/dealii-9.1.1-no-ld-flags.patch | 20 -------- ...-remove-superfluous-explicit-instantiatio.patch | 59 ---------------------- ...mark-a-template-variable-to-have-const-in.patch | 28 ---------- 3 files changed, 107 deletions(-) diff --git a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch b/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch deleted file mode 100644 index 69c2c09e679c..000000000000 --- a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/config/config_debug.pc.in b/cmake/config/config_debug.pc.in -index 5ea03885cd..32e45d8121 100644 ---- a/cmake/config/config_debug.pc.in -+++ b/cmake/config/config_debug.pc.in -@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@ - URL: https://dealii.org/ - - Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_DEBUG@ @CONFIG_INCLUDE_DIRS_PC@ --Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_DEBUG@ @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@ -+Libs: @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@ -diff --git a/cmake/config/config_release.pc.in b/cmake/config/config_release.pc.in -index 726a35d040..8a879d07e8 100644 ---- a/cmake/config/config_release.pc.in -+++ b/cmake/config/config_release.pc.in -@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@ - URL: https://dealii.org/ - - Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_RELEASE@ @CONFIG_INCLUDE_DIRS_PC@ --Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_RELEASE@ @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@ -+Libs: @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@ diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch deleted file mode 100644 index 85a78c4c1326..000000000000 --- a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aafc2c19dfd3ebc43e37ba3f13eda5f790376b1c Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tam...@43-1.org> -Date: Thu, 15 Feb 2024 15:54:36 -0600 -Subject: [PATCH 1/2] base/mpi.cc: remove superfluous explicit instantiations - of template variable - -The `mpi.h` header already contains: -``` -template <typename T> -const MPI_Datatype mpi_type_id_for_type = /* implementation detail */; -``` -Meaning, the variable is known fully after including the header. -Furthermore, the `const` qualifier marks the (template) variable as -`static`. I.e., it has internal linkage. - -Thus, we must not explicitly instantiate the variables (suggesting -"extern" linkage in all but the `mpi.cc` compilation unit). This -apparently not an issue with OpenMPI because `MPI_Datatype` is a -complex data structure. But it is an issue with mpich where -`MPI_Datatype` is a simple `int` - leading to a segmentation fault when -during program startup. ---- - source/base/mpi.cc | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/source/base/mpi.cc b/source/base/mpi.cc -index dab88e2b97..f845845764 100644 ---- a/source/base/mpi.cc -+++ b/source/base/mpi.cc -@@ -100,26 +100,6 @@ namespace Utilities - - namespace MPI - { --#ifdef DEAL_II_WITH_MPI -- // Provide definitions of template variables for all valid instantiations. -- template const MPI_Datatype mpi_type_id_for_type<bool>; -- template const MPI_Datatype mpi_type_id_for_type<char>; -- template const MPI_Datatype mpi_type_id_for_type<signed char>; -- template const MPI_Datatype mpi_type_id_for_type<short>; -- template const MPI_Datatype mpi_type_id_for_type<int>; -- template const MPI_Datatype mpi_type_id_for_type<long int>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned char>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned short>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned long int>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned long long int>; -- template const MPI_Datatype mpi_type_id_for_type<float>; -- template const MPI_Datatype mpi_type_id_for_type<double>; -- template const MPI_Datatype mpi_type_id_for_type<long double>; -- template const MPI_Datatype mpi_type_id_for_type<std::complex<float>>; -- template const MPI_Datatype mpi_type_id_for_type<std::complex<double>>; --#endif -- -- - MinMaxAvg - min_max_avg(const double my_value, const MPI_Comm mpi_communicator) - { --- -2.43.0 - diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch deleted file mode 100644 index 032b12237bd2..000000000000 --- a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2ef67e3896a2a7d0ba93539cf79310384470fc91 Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tam...@43-1.org> -Date: Thu, 15 Feb 2024 16:03:22 -0600 -Subject: [PATCH 2/2] base/mpi.h: mark a template variable to have "const - inline" linkage. - ---- - include/deal.II/base/mpi.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h -index b77fd3e7c8..8ee55fbe41 100644 ---- a/include/deal.II/base/mpi.h -+++ b/include/deal.II/base/mpi.h -@@ -1728,8 +1728,8 @@ namespace Utilities - * not satisfied. - */ - template <typename T> -- const MPI_Datatype -- mpi_type_id_for_type = internal::MPIDataTypes::mpi_type_id( -+ inline const MPI_Datatype mpi_type_id_for_type = -+ internal::MPIDataTypes::mpi_type_id( - static_cast<std::remove_cv_t<std::remove_reference_t<T>> *>(nullptr)); - #endif - --- -2.43.0 -
