diff options
Diffstat (limited to 'sci-libs/dealii')
4 files changed, 0 insertions, 110 deletions
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index f2fbf13c3af6..cba6406946ee 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -1,6 +1,3 @@ -AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09 -AUX dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch 2443 BLAKE2B f4df5afc449fd64951f21f9a243c504c57a2b8e6525b6215c9edf539b26cda863a311e31d65726091af239cb8d5aa1a00d32ec52ff0aca1cfa7f01523c934010 SHA512 dcc1e87c393437e0a13e19f70a2096af052eba34ae82c9f2e640a2cb83014aaaa71a20e2a2efcd91a55d08b2e796669113388b8953da7a412ff181628da50db6 -AUX dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch 894 BLAKE2B 097db57d5fbf5d7f6f4c1545da6fe0c49c2dad674c3da1a7a30e17d3a9c9b4da36946c24b3507c397d8f9f8551be1f934593eff79f15448863f8a7c6e416e323 SHA512 83f4085d88e67d6d93e045d6ce672c67273a86e96f1c608134637198e3acda25451af9b2fc13dc97fee8c76db3bdfb750c5bb6f46a4b74fcf96a45b2fd1bf821 DIST dealii-9.5.0-offline_documentation.tar.gz 412499027 BLAKE2B 521aa2488d84d48a624f4cbdbe9c173d0cdcee2df8d06b97b7c25ba28d4a2113a7da9fd9abd9eb64cd56b37f8edc716bd034fc3ba8823f8b1def26c34aaeeb55 SHA512 2e0d331f92d52b0fd909a0139157a1960a9222d46d537611f0508cdb79020a8e51ff0da6aefdf95adff732cea050b72df7dc1a8af7e93c736721970218815cfe DIST dealii-9.5.0-offline_documentation.tar.gz.asc 246 BLAKE2B 0a570885e80ad09ff154532b71c07e33894e93c96b3bca48dc8aae0b308883518cbb5eca57658c4e13de47efba47c3cb20bf376482ef7a26c6c0da93ee4dd689 SHA512 b63a9a0504fe5266b448ffda74e1d85ad5b6f344535c5b5f11d209546b51bb916ad69504ce5e4f1fd2287407c2d3d98a20b01bd830e8d45f510a85b7a057a8d5 DIST dealii-9.6.2.tar.gz 40863604 BLAKE2B 5214b9cfd78e48f2588046b1a3d68837f9d856191c77d179c384ddaa524a464bd2cd9eef6597bdc036e9fa7121843c048ff035fa926aa67a1a15e1c1f85f276e SHA512 79fe3c3baba4bcb479f30ae863e577e64d0a6ea488172a9d6bacecf1e5ec845f47eff9a8bf3cb4651e6803b9b0c38dc32ca745abc64737d66aedf7ec73c2e362 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 <tamiko@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 <tamiko@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 - |