* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/
@ 2020-01-21 20:47 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-01-21 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 06a2e799559c779da1b073fef804d4ca1a548af6
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Jan 16 18:11:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 20:42:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a2e799
sci-libs/libgeodecomp: Fix file collision with libflatarray
As of commit 948ee21633c0 ("sci-libs/libgeodecomp: added dependency to
libflatarray") libgeodecomp depends on libflatarray which is correct. Therefore,
libgeodecomp uses the system installed libflatarray. However, it also bundles
its own version libflatarray and installs that one unconditionally which results
in the file collision.
Thus, simply don't install the libflatarray files whenever the system one is
used. That resolves the issue.
While here, bump EAPI to 7 and remove visit use flag. VisIt has been removed.
Bug: https://bugs.gentoo.org/688932
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/14368
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libgeodecomp-0.4.0-lfa.patch | 37 ++++++++++++++++++++++
...p-0.4.0.ebuild => libgeodecomp-0.4.0-r1.ebuild} | 37 ++++++++++++----------
2 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch
new file mode 100644
index 00000000000..463d416b3bf
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch
@@ -0,0 +1,37 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 673017f0..28704461 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -528,18 +528,20 @@ foreach(dir ${LIBDIRS})
+ endforeach(dir)
+
+ # install libflatarray, too
+-file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp")
+-foreach(i ${HEADERS})
+- install(FILES ${i} DESTINATION include/libflatarray)
+-endforeach()
+-file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp")
+-foreach(i ${HEADERS})
+- install(FILES ${i} DESTINATION include/libflatarray/detail)
+-endforeach()
+-file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp")
+-foreach(i ${HEADERS})
+- install(FILES ${i} DESTINATION include/libflatarray/testbed)
+-endforeach()
++if(NOT libflatarray_FOUND)
++ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp")
++ foreach(i ${HEADERS})
++ install(FILES ${i} DESTINATION include/libflatarray)
++ endforeach()
++ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp")
++ foreach(i ${HEADERS})
++ install(FILES ${i} DESTINATION include/libflatarray/detail)
++ endforeach()
++ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp")
++ foreach(i ${HEADERS})
++ install(FILES ${i} DESTINATION include/libflatarray/testbed)
++ endforeach()
++endif()
+
+ # link against the libs we need
+ set(INSTALLER_LINK_FLAGS "-L${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -lgeodecomp ")
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
similarity index 72%
rename from sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
rename to sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
index 14e3f4f3cc8..5237072823e 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils cuda
+inherit cmake cuda
DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
HOMEPAGE="http://www.libgeodecomp.org"
@@ -14,27 +14,31 @@ LICENSE="Boost-1.0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc mpi cuda opencl opencv silo hpx visit"
-RDEPEND=">=dev-libs/boost-1.48"
-DEPEND="${RDEPEND}
+BDEPEND="
doc? (
app-doc/doxygen
app-text/texlive
media-gfx/graphviz
- )
+ )"
+RDEPEND=">=dev-libs/boost-1.48"
+DEPEND="${RDEPEND}
hpx? ( sys-cluster/hpx )
<=dev-libs/libflatarray-0.2.0
mpi? ( virtual/mpi )
cuda? ( dev-util/nvidia-cuda-toolkit )
opencl? ( virtual/opencl )
opencv? ( media-libs/opencv )
- silo? ( sci-libs/silo )
- visit? ( sci-visualization/visit )"
+ silo? ( sci-libs/silo )"
S="${WORKDIR}/${P}"
-PATCHES=( "${FILESDIR}/${P}-scotch.patch" "${FILESDIR}/${P}-libdir.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-scotch.patch"
+ "${FILESDIR}/${P}-libdir.patch"
+ "${FILESDIR}/${P}-lfa.patch"
+)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
use cuda && cuda_src_prepare
}
@@ -47,22 +51,23 @@ src_configure() {
-DWITH_SILO=$(usex silo)
-DWITH_SCOTCH=false
-DWITH_HPX=$(usex hpx)
- -DWITH_VISIT=$(usex visit)
+ -DWITH_VISIT=false
+ -DWITH_TYPEMAPS=false
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doc
+ cmake_src_compile
+ use doc && cmake_build doc
}
src_install() {
DOCS=( README )
use doc && HTML_DOCS=( doc/html/* )
- cmake-utils_src_install
+ cmake_src_install
}
src_test() {
- cmake-utils_src_make check
+ cmake_build check
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/
@ 2020-03-28 14:21 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-03-28 14:21 UTC (permalink / raw
To: gentoo-commits
commit: d5ad9cb37baba095c84c5ad507d43624542c740a
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Mar 26 19:54:14 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 14:21:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ad9cb3
sci-libs/libgeodecomp: Fix compile issues against hpx v1.4
Adding patches to fix compile issues and warnings against
>=sys-cluster/hpx-1.4.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/15137
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/libgeodecomp-0.5.0_pre20200314-hpx.patch | 246 +++++++++++++++++++++
.../libgeodecomp-0.5.0_pre20200314-warnings.patch | 33 +++
.../libgeodecomp-0.5.0_pre20200314.ebuild | 4 +-
3 files changed, 282 insertions(+), 1 deletion(-)
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch
new file mode 100644
index 00000000000..9f71ea087c6
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch
@@ -0,0 +1,246 @@
+From fe581cc24805288c6c1a9b26a4b72748906f16c8 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 26 Mar 2020 15:58:46 +0100
+Subject: [PATCH] hpx: Remove use of deprecated header
+
+The current hpx version is v1.4. Remove the usage of deprecated hpx headers and
+make it compile again.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/libgeodecomp/communication/hpxreceiver.h | 5 ++---
+ src/libgeodecomp/communication/hpxserializationwrapper.h | 8 ++++----
+ .../communication/test/parallel_hpx_4/hpxreceivertest.h | 5 ++---
+ src/libgeodecomp/geometry/coord.h | 4 ++--
+ src/libgeodecomp/io/mocksteerer.h | 5 +++++
+ src/libgeodecomp/io/mockwriter.h | 5 +++++
+ src/libgeodecomp/misc/clonable.h | 2 +-
+ src/libgeodecomp/misc/nonpodtestcell.h | 2 +-
+ src/libgeodecomp/parallelization/hpxsimulator.cpp | 2 +-
+ src/libgeodecomp/parallelization/hpxsimulator.h | 9 ++++-----
+ src/libgeodecomp/storage/displacedgrid.h | 4 ++--
+ src/libgeodecomp/storage/grid.h | 4 ++--
+ src/libgeodecomp/storage/patchprovider.h | 3 ++-
+ .../storage/test/unit/reorderingunstructuredgridtest.h | 4 ++--
+ 14 files changed, 35 insertions(+), 27 deletions(-)
+
+diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
+index 1a0baf9bbdee..beb657b88bbc 100644
+--- a/src/libgeodecomp/communication/hpxreceiver.h
++++ b/src/libgeodecomp/communication/hpxreceiver.h
+@@ -10,10 +10,9 @@
+
+ #include <hpx/include/components.hpp>
+ #include <hpx/include/lcos.hpp>
+-#include <hpx/lcos/broadcast.hpp>
+-#include <hpx/lcos/local/receive_buffer.hpp>
++#include <hpx/collectives/broadcast.hpp>
++#include <hpx/local_lcos/receive_buffer.hpp>
+ #include <hpx/runtime/get_ptr.hpp>
+-#include <hpx/util/unwrapped.hpp>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+ #include <libgeodecomp/misc/stringops.h>
+
+diff --git a/src/libgeodecomp/communication/hpxserializationwrapper.h b/src/libgeodecomp/communication/hpxserializationwrapper.h
+index 5ebf06c4cf7c..0afb145840a6 100644
+--- a/src/libgeodecomp/communication/hpxserializationwrapper.h
++++ b/src/libgeodecomp/communication/hpxserializationwrapper.h
+@@ -10,10 +10,10 @@
+ * just pull in this header.
+ */
+ #include <libgeodecomp/communication/hpxserialization.h>
+-#include <hpx/runtime/serialization/map.hpp>
+-#include <hpx/runtime/serialization/serialize.hpp>
+-#include <hpx/runtime/serialization/shared_ptr.hpp>
+-#include <hpx/runtime/serialization/vector.hpp>
++#include <hpx/serialization/map.hpp>
++#include <hpx/serialization/serialize.hpp>
++#include <hpx/serialization/shared_ptr.hpp>
++#include <hpx/serialization/vector.hpp>
+
+ #endif
+
+diff --git a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
+index ab16a0947546..b2f9c6d47559 100644
+--- a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
++++ b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
+@@ -1,9 +1,8 @@
+ #include <cxxtest/TestSuite.h>
+ #include <hpx/hpx.hpp>
+-#include <hpx/lcos/broadcast.hpp>
++#include <hpx/collectives/broadcast.hpp>
+ #include <hpx/runtime/components/component_factory.hpp>
+-#include <hpx/runtime/serialization/serialize_buffer.hpp>
+-#include <hpx/util/unwrapped.hpp>
++#include <hpx/serialization/serialize_buffer.hpp>
+ #include <libgeodecomp/communication/hpxreceiver.h>
+ #include <libgeodecomp/misc/stringops.h>
+
+diff --git a/src/libgeodecomp/geometry/coord.h b/src/libgeodecomp/geometry/coord.h
+index 5df21310d3ee..8772980c52df 100644
+--- a/src/libgeodecomp/geometry/coord.h
++++ b/src/libgeodecomp/geometry/coord.h
+@@ -10,8 +10,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <hpx/config.hpp>
+-#include <hpx/runtime/serialization/array.hpp>
+-#include <hpx/runtime/serialization/serialize.hpp>
++#include <hpx/serialization/array.hpp>
++#include <hpx/serialization/serialize.hpp>
+ #endif
+
+ // For Intel MPI we need to source mpi.h before stdio.h:
+diff --git a/src/libgeodecomp/io/mocksteerer.h b/src/libgeodecomp/io/mocksteerer.h
+index 4ab2d28c5097..e20d0d5bb6bf 100644
+--- a/src/libgeodecomp/io/mocksteerer.h
++++ b/src/libgeodecomp/io/mocksteerer.h
+@@ -4,6 +4,11 @@
+ #include <sstream>
+ #include <libgeodecomp/io/steerer.h>
+
++#ifdef LIBGEODECOMP_WITH_HPX
++#include <hpx/include/threads.hpp>
++#include <hpx/concurrency/spinlock.hpp>
++#endif
++
+ namespace LibGeoDecomp {
+
+ namespace MockSteererHelpers {
+diff --git a/src/libgeodecomp/io/mockwriter.h b/src/libgeodecomp/io/mockwriter.h
+index 4d6d13c93acb..36cb7e1e1ae6 100644
+--- a/src/libgeodecomp/io/mockwriter.h
++++ b/src/libgeodecomp/io/mockwriter.h
+@@ -8,6 +8,11 @@
+ #include <libgeodecomp/misc/clonable.h>
+ #include <libgeodecomp/misc/testcell.h>
+
++#ifdef LIBGEODECOMP_WITH_HPX
++#include <hpx/include/threads.hpp>
++#include <hpx/concurrency/spinlock.hpp>
++#endif
++
+ #include <sstream>
+
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/misc/clonable.h b/src/libgeodecomp/misc/clonable.h
+index 8162513826b8..a1dccbf94bd3 100644
+--- a/src/libgeodecomp/misc/clonable.h
++++ b/src/libgeodecomp/misc/clonable.h
+@@ -5,7 +5,7 @@
+
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+-#include <hpx/runtime/serialization/base_object.hpp>
++#include <hpx/serialization/base_object.hpp>
+ #endif
+
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/misc/nonpodtestcell.h b/src/libgeodecomp/misc/nonpodtestcell.h
+index 66453ce80ba7..1618c8359b90 100644
+--- a/src/libgeodecomp/misc/nonpodtestcell.h
++++ b/src/libgeodecomp/misc/nonpodtestcell.h
+@@ -11,7 +11,7 @@
+ #endif
+
+ #ifdef LIBGEODECOMP_WITH_HPX
+-#include <hpx/runtime/serialization/set.hpp>
++#include <hpx/serialization/set.hpp>
+ #endif
+
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/parallelization/hpxsimulator.cpp b/src/libgeodecomp/parallelization/hpxsimulator.cpp
+index 6e2fb6c78519..0329d6815913 100644
+--- a/src/libgeodecomp/parallelization/hpxsimulator.cpp
++++ b/src/libgeodecomp/parallelization/hpxsimulator.cpp
+@@ -3,7 +3,7 @@
+
+ #include <libgeodecomp/parallelization/hpxsimulator.h>
+ #include <hpx/include/lcos.hpp>
+-#include <hpx/lcos/broadcast.hpp>
++#include <hpx/collectives/broadcast.hpp>
+
+ namespace LibGeoDecomp {
+ namespace HpxSimulatorHelpers {
+diff --git a/src/libgeodecomp/parallelization/hpxsimulator.h b/src/libgeodecomp/parallelization/hpxsimulator.h
+index 1ccdf883e915..15b5a3628f9d 100644
+--- a/src/libgeodecomp/parallelization/hpxsimulator.h
++++ b/src/libgeodecomp/parallelization/hpxsimulator.h
+@@ -6,11 +6,10 @@
+
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <hpx/config.hpp>
+-#include <hpx/runtime/serialization/set.hpp>
+-#include <hpx/runtime/serialization/string.hpp>
+-#include <hpx/runtime/serialization/vector.hpp>
+-#include <hpx/include/lcos.hpp>
+-#include <hpx/lcos/broadcast.hpp>
++#include <hpx/serialization/set.hpp>
++#include <hpx/serialization/string.hpp>
++#include <hpx/serialization/vector.hpp>
++#include <hpx/collectives/broadcast.hpp>
+
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+ #include <libgeodecomp/geometry/partitions/stripingpartition.h>
+diff --git a/src/libgeodecomp/storage/displacedgrid.h b/src/libgeodecomp/storage/displacedgrid.h
+index 5c72e520ce48..a8831053fedc 100644
+--- a/src/libgeodecomp/storage/displacedgrid.h
++++ b/src/libgeodecomp/storage/displacedgrid.h
+@@ -19,8 +19,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+-#include <hpx/runtime/serialization/input_archive.hpp>
+-#include <hpx/runtime/serialization/output_archive.hpp>
++#include <hpx/serialization/input_archive.hpp>
++#include <hpx/serialization/output_archive.hpp>
+ #endif
+
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/storage/grid.h b/src/libgeodecomp/storage/grid.h
+index 6e218696f625..821b02002c87 100644
+--- a/src/libgeodecomp/storage/grid.h
++++ b/src/libgeodecomp/storage/grid.h
+@@ -26,8 +26,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+-#include <hpx/runtime/serialization/input_archive.hpp>
+-#include <hpx/runtime/serialization/output_archive.hpp>
++#include <hpx/serialization/input_archive.hpp>
++#include <hpx/serialization/output_archive.hpp>
+ #endif
+
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/storage/patchprovider.h b/src/libgeodecomp/storage/patchprovider.h
+index 71fda8091e95..66aa67f214fa 100644
+--- a/src/libgeodecomp/storage/patchprovider.h
++++ b/src/libgeodecomp/storage/patchprovider.h
+@@ -2,7 +2,8 @@
+ #define LIBGEODECOMP_STORAGE_PATCHPROVIDER_H
+
+ #ifdef LIBGEODECOMP_WITH_HPX
+-#include <hpx/lcos/local/spinlock.hpp>
++#include <hpx/include/threads.hpp>
++#include <hpx/synchronization/spinlock.hpp>
+ #include <mutex>
+ #endif
+
+diff --git a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
+index d89146a4bf69..7cb5203dae44 100644
+--- a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
++++ b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
+@@ -19,8 +19,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+-#include <hpx/runtime/serialization/input_archive.hpp>
+-#include <hpx/runtime/serialization/output_archive.hpp>
++#include <hpx/serialization/input_archive.hpp>
++#include <hpx/serialization/output_archive.hpp>
+ #endif
+
+ using namespace LibGeoDecomp;
+--
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch
new file mode 100644
index 00000000000..2a7acd0c655
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch
@@ -0,0 +1,33 @@
+From 87e1918e13fa3f3124e945a0ea12cfb339ddf303 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 26 Mar 2020 16:05:02 +0100
+Subject: [PATCH] hpx: receiver: Remove std::move() call
+
+This fixes the following warning:
+
+|/home/kurt/git/libgeodecomp/src/libgeodecomp/communication/hpxreceiver.h:138:29: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
+| 138 | return std::move(vec);
+
+The compiler should be smart enough to optimize the correct way :).
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/libgeodecomp/communication/hpxreceiver.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
+index beb657b88bbc..28de314d5ef5 100644
+--- a/src/libgeodecomp/communication/hpxreceiver.h
++++ b/src/libgeodecomp/communication/hpxreceiver.h
+@@ -135,7 +135,7 @@ public:
+ vec << receiver->get(i).get();
+ }
+
+- return std::move(vec);
++ return vec;
+ }
+
+ private:
+--
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
index a14dc9c0714..90abc7144a3 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
@@ -43,8 +43,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
PATCHES=(
- "${FILESDIR}/${P}-mpi.patch"
+ "${FILESDIR}/${P}-hpx.patch"
"${FILESDIR}/${P}-libdir.patch"
+ "${FILESDIR}/${P}-mpi.patch"
+ "${FILESDIR}/${P}-warnings.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/
@ 2020-03-28 14:21 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-03-28 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 970a27005ddce247961dbe9e6e215158c9985be9
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Mar 26 15:32:56 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 14:21:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970a2700
sci-libs/libgeodecomp: Drop old
Reason: It's quite old and would require to maintain lots of other old libraries
versions of cuda, hpx, libflatarray...
I'd recommend to use the pre 0.5.0 version to get all the newest features
anyway.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 -
.../files/libgeodecomp-0.4.0-boost.patch | 92 ------------
.../files/libgeodecomp-0.4.0-lfa.patch | 37 -----
.../files/libgeodecomp-0.4.0-libdir.patch | 19 ---
.../files/libgeodecomp-0.4.0-scotch.patch | 163 ---------------------
sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild | 76 ----------
6 files changed, 388 deletions(-)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index a74db5cd610..b0aab143193 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,2 +1 @@
-DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-boost.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-boost.patch
deleted file mode 100644
index d706950af59..00000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-boost.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From f964fc68b745cc200a1df9e442a2dd8e908f0248 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Sun, 8 Mar 2020 10:53:53 +0100
-Subject: [PATCH] cmake: Disable use of HPX boost libraries
-
-First of all the wrong variables are referenced. Second HPX doesn't include
-date_time which is needed by the tracing writer. So that does not work.
-
-Use the system boost libraries.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/CMakeLists.txt | 60 +++++++++++++++++-----------------------------
- 1 file changed, 22 insertions(+), 38 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2870446108d0..f1a15abb0161 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -2,47 +2,31 @@
-
- find_package(HPX)
-
--if(NOT HPX_FOUND)
-- if(NOT DEFINED BOOST_ROOT)
-- # deduce Boost location from environment (e.g. on woody.rrze.uni-erlangen.de)
-- set(BOOST_ENV_LIBDIR "$ENV{BOOST_LIBDIR}")
-- if(BOOST_ENV_LIBDIR)
-- set(Boost_NO_SYSTEM_PATHS true)
-- set(BOOST_ROOT "$ENV{BOOST_LIBDIR}/../")
-- set(Boost_LIBRARY_DIRS "$ENV{BOOST_LIBDIR}")
-- set(Boost_INCLUDE_DIR "$ENV{BOOST_INCDIR}")
-- endif()
-+if(NOT DEFINED BOOST_ROOT)
-+ # deduce Boost location from environment (e.g. on woody.rrze.uni-erlangen.de)
-+ set(BOOST_ENV_LIBDIR "$ENV{BOOST_LIBDIR}")
-+ if(BOOST_ENV_LIBDIR)
-+ set(Boost_NO_SYSTEM_PATHS true)
-+ set(BOOST_ROOT "$ENV{BOOST_LIBDIR}/../")
-+ set(Boost_LIBRARY_DIRS "$ENV{BOOST_LIBDIR}")
-+ set(Boost_INCLUDE_DIR "$ENV{BOOST_INCDIR}")
- endif()
--
-- # mandatory Boost libs go into the first line, optional ones into
-- # their own call. This avoids leaving out any available lib during
-- # link time. The reason for this ugly multi-stage discovery is the
-- # following: since CMAKE 2.8.11 each call to find_package(Boost...)
-- # will reset Boost_LIBRARIES.
-- find_package(Boost REQUIRED COMPONENTS date_time filesystem system)
-- set(ALL_BOOST_LIBS "${Boost_LIBRARIES}")
-- find_package(Boost COMPONENTS serialization)
-- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
-- find_package(Boost COMPONENTS thread)
-- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
-- find_package(Boost COMPONENTS move)
-- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
--else()
-- # If HPX was found, we use the Boost libraries found by HPX
-- set(ALL_BOOST_LIBS
-- ${HPX_BOOST_DATE_TIME_LIBRARY}
-- ${HPX_BOOST_FILESYSTEM_LIBRARY}
-- ${HPX_BOOST_SYSTEM_LIBRARY}
-- ${HPX_BOOST_SERIALIZATION_LIBRARY}
-- ${HPX_BOOST_THREAD_LIBRARY}
-- )
-- set(Boost_DATE_TIME_FOUND true)
-- set(Boost_FILESYSTEM_FOUND true)
-- set(Boost_SYSTEM_FOUND true)
-- set(Boost_SERIALIZATION_FOUND true)
-- set(Boost_THREAD_FOUND true)
- endif()
-
-+# mandatory Boost libs go into the first line, optional ones into
-+# their own call. This avoids leaving out any available lib during
-+# link time. The reason for this ugly multi-stage discovery is the
-+# following: since CMAKE 2.8.11 each call to find_package(Boost...)
-+# will reset Boost_LIBRARIES.
-+find_package(Boost REQUIRED COMPONENTS date_time filesystem system)
-+set(ALL_BOOST_LIBS "${Boost_LIBRARIES}")
-+find_package(Boost COMPONENTS serialization)
-+set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
-+find_package(Boost COMPONENTS thread)
-+set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
-+find_package(Boost COMPONENTS move)
-+set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
-+
- find_package(Boost COMPONENTS mpi)
- set(Boost_MPI_LIBRARIES "${Boost_LIBRARIES}")
-
---
-2.24.1
-
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch
deleted file mode 100644
index 463d416b3bf..00000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 673017f0..28704461 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -528,18 +528,20 @@ foreach(dir ${LIBDIRS})
- endforeach(dir)
-
- # install libflatarray, too
--file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp")
--foreach(i ${HEADERS})
-- install(FILES ${i} DESTINATION include/libflatarray)
--endforeach()
--file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp")
--foreach(i ${HEADERS})
-- install(FILES ${i} DESTINATION include/libflatarray/detail)
--endforeach()
--file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp")
--foreach(i ${HEADERS})
-- install(FILES ${i} DESTINATION include/libflatarray/testbed)
--endforeach()
-+if(NOT libflatarray_FOUND)
-+ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp")
-+ foreach(i ${HEADERS})
-+ install(FILES ${i} DESTINATION include/libflatarray)
-+ endforeach()
-+ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp")
-+ foreach(i ${HEADERS})
-+ install(FILES ${i} DESTINATION include/libflatarray/detail)
-+ endforeach()
-+ file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp")
-+ foreach(i ${HEADERS})
-+ install(FILES ${i} DESTINATION include/libflatarray/testbed)
-+ endforeach()
-+endif()
-
- # link against the libs we need
- set(INSTALLER_LINK_FLAGS "-L${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -lgeodecomp ")
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
deleted file mode 100644
index 39da128feff..00000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0666f1d..673017f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -509,11 +509,12 @@ endif()
- target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES})
-
- #============= 10. INSTALLER CONFIG ==================================
-+include(GNUInstallDirs)
- install(
- TARGETS geodecomp
- EXPORT ${PACKAGE_NAME}-targets
-- ARCHIVE DESTINATION lib
-- LIBRARY DESTINATION lib)
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- install(FILES "${CMAKE_BINARY_DIR}/${PACKAGE_NAME}/config.h" DESTINATION include/${PACKAGE_NAME})
- install(FILES libgeodecomp.h DESTINATION include)
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch
deleted file mode 100644
index 774293f34c4..00000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
-index 9f22b8d..0755470 100644
---- a/CMakeModules/FindSCOTCH.cmake
-+++ b/CMakeModules/FindSCOTCH.cmake
-@@ -232,81 +232,83 @@ int main() {
- ")
-
- message(STATUS "Performing test SCOTCH_TEST_RUNS")
-- try_run(
-- SCOTCH_TEST_LIB_EXITCODE
-- SCOTCH_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
-- )
--
-- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- # Output some variables
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
--
-- # If program does not run, try adding zlib library and test again
-- if(NOT SCOTCH_TEST_RUNS)
-- if (NOT ZLIB_FOUND)
-- find_package(ZLIB)
-- endif()
--
-- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
--
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
-- try_run(
-- SCOTCH_ZLIB_TEST_LIB_EXITCODE
-- SCOTCH_ZLIB_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
-- )
--
-- # Add zlib flags if required and set test run to 'true'
-- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
--
-- endif()
-- endif()
-+ set(SCOTCH_TEST_RUNS FALSE)
-+ message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-+ # try_run(
-+ # SCOTCH_TEST_LIB_EXITCODE
-+ # SCOTCH_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
-+ # )
-+
-+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # # Output some variables
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+
-+ # # If program does not run, try adding zlib library and test again
-+ # if(NOT SCOTCH_TEST_RUNS)
-+ # if (NOT ZLIB_FOUND)
-+ # find_package(ZLIB)
-+ # endif()
-+
-+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
-+
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
-+ # try_run(
-+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE
-+ # SCOTCH_ZLIB_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
-+ # )
-+
-+ # # Add zlib flags if required and set test run to 'true'
-+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+
-+ # endif()
-+ # endif()
- endif()
- endif()
-
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
deleted file mode 100644
index d1c5b322934..00000000000
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake cuda
-
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="
- http://www.libgeodecomp.org
- https://github.com/STEllAR-GROUP/libgeodecomp"
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc hpx mpi opencl opencv silo"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- app-text/texlive
- media-gfx/graphviz
- )"
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
- <dev-libs/libflatarray-0.3.0
- cuda? ( dev-util/nvidia-cuda-toolkit )
- hpx? ( sys-cluster/hpx )
- mpi? ( virtual/mpi )
- opencl? ( virtual/opencl )
- opencv? ( media-libs/opencv )
- silo? ( sci-libs/silo )"
-
-S="${WORKDIR}/${P}"
-PATCHES=(
- "${FILESDIR}/${P}-scotch.patch"
- "${FILESDIR}/${P}-libdir.patch"
- "${FILESDIR}/${P}-lfa.patch"
- "${FILESDIR}/${P}-boost.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CUDA=$(usex cuda)
- -DWITH_HPX=$(usex hpx)
- -DWITH_MPI=$(usex mpi)
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCV=$(usex opencv)
- -DWITH_SCOTCH=false
- -DWITH_SILO=$(usex silo)
- -DWITH_TYPEMAPS=false
- -DWITH_VISIT=false
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_build doc
-}
-
-src_install() {
- DOCS=( README )
- use doc && HTML_DOCS=( doc/html/* )
- cmake_src_install
-}
-
-src_test() {
- cmake_build check
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/
@ 2020-10-31 9:47 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-10-31 9:47 UTC (permalink / raw
To: gentoo-commits
commit: ea42befab45a5e6e6dfacf5d6b3cf20f257c80d1
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Sep 26 14:13:56 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:47:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea42befa
sci-libs/libgeodecomp: Drop old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 -
.../files/libgeodecomp-0.5.0_pre20200420-mpi.patch | 292 ---------------------
.../libgeodecomp-0.5.0_pre20200420.ebuild | 82 ------
3 files changed, 375 deletions(-)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 566c35f25be..b0f683b51f4 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,2 +1 @@
-DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
DIST libgeodecomp-0.5.0_pre20201009.tar.gz 1510212 BLAKE2B fdddf8ef8dd93d0a4860dbde27d1e59bda039b27ff7526a1ddfb6cfe8103f54edd2a847dad2ffa1cdc0c4454b2d48e0df7e5f941ad2a9df9c848868817413b03 SHA512 42a28fcce6408c610265f8cde9c9d46e83519a8ec4a3e6b1f0e6637597b4b9a702c43655f9c1cf5a159012533f2c2e937de21bda2aed54cdd6acd19ec5b4030a
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch
deleted file mode 100644
index 1a1164e342b..00000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 24 Jan 2020 17:59:48 +0100
-Subject: [PATCH] cmake: Disable mpiruns
-
-The mpiruns will violate the sandboxing. Therefore, disable them including
-scotch.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- CMakeLists.txt | 14 +-
- CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++-----------------
- 2 files changed, 121 insertions(+), 131 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed5cc607c3ed..fec488002958 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64")
- set(AMD64_LINUX true)
- endif()
-
--# test if mpirun/mpiexec supports the --oversubscribe flag:
-+# use the --oversubscribe flag:
- if(MPI_FOUND)
-- execute_process(
-- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok
-- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE
-- OUTPUT_QUIET
-- ERROR_QUIET)
--
-- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0)
-- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
-- else()
-- set(MPIEXEC_OVERSUBSCRIBE_FLAG "")
-- endif()
-+ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
- endif()
-
- #============= 3. CONFIGURABLE BUILD OPTIONS =========================
-diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
-index 5c717977dbba..146c2bf8bb60 100644
---- a/CMakeModules/FindSCOTCH.cmake
-+++ b/CMakeModules/FindSCOTCH.cmake
-@@ -233,125 +233,125 @@ int main() {
- ")
-
- message(STATUS "Performing test SCOTCH_TEST_RUNS")
-- try_run(
-- SCOTCH_TEST_LIB_EXITCODE
-- SCOTCH_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
-- )
--
-- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- # Output some variables
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
--
-- # If program does not run, try adding zlib library and test again
-- if(NOT SCOTCH_TEST_RUNS)
-- if (NOT ZLIB_FOUND)
-- find_package(ZLIB)
-- endif()
--
-- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
--
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
-- try_run(
-- SCOTCH_ZLIB_TEST_LIB_EXITCODE
-- SCOTCH_ZLIB_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
-- )
--
-- # Add zlib flags if required and set test run to 'true'
-- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
--
-- endif()
-- endif()
--
-- if(NOT SCOTCH_TEST_RUNS)
-- if (NOT BZIP2_FOUND)
-- find_package(BZip2)
-- endif()
--
-- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
--
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
-- try_run(
-- SCOTCH_BZIP2_TEST_LIB_EXITCODE
-- SCOTCH_BZIP2_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
-- )
--
-- # Add zlib flags if required and set test run to 'true'
-- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
-- endif()
-- endif()
-+ # try_run(
-+ # SCOTCH_TEST_LIB_EXITCODE
-+ # SCOTCH_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
-+ # )
-+
-+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # # Output some variables
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+
-+ # # If program does not run, try adding zlib library and test again
-+ # if(NOT SCOTCH_TEST_RUNS)
-+ # if (NOT ZLIB_FOUND)
-+ # find_package(ZLIB)
-+ # endif()
-+
-+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
-+
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
-+ # try_run(
-+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE
-+ # SCOTCH_ZLIB_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
-+ # )
-+
-+ # # Add zlib flags if required and set test run to 'true'
-+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+
-+ # endif()
-+ # endif()
-+
-+ # if(NOT SCOTCH_TEST_RUNS)
-+ # if (NOT BZIP2_FOUND)
-+ # find_package(BZip2)
-+ # endif()
-+
-+ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
-+
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
-+ # try_run(
-+ # SCOTCH_BZIP2_TEST_LIB_EXITCODE
-+ # SCOTCH_BZIP2_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
-+ # )
-+
-+ # # Add zlib flags if required and set test run to 'true'
-+ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+ # endif()
-+ # endif()
-
- endif()
- endif()
---
-2.24.1
-
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
deleted file mode 100644
index d269428d5cd..00000000000
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake cuda virtualx
-
-MY_COMMIT="69c5573ac7b2b654d649e8902fad73b05bf33644"
-
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="
- http://www.libgeodecomp.org
- https://github.com/STEllAR-GROUP/libgeodecomp"
-SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc hpx mpi opencl opencv qt5 silo"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- app-text/texlive
- media-gfx/graphviz
- )"
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
- ~dev-libs/libflatarray-0.4.0_pre20200314
- cuda? ( dev-util/nvidia-cuda-toolkit )
- hpx? ( sys-cluster/hpx )
- mpi? ( virtual/mpi )
- opencl? ( virtual/opencl )
- opencv? ( media-libs/opencv )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- silo? ( sci-libs/silo )"
-
-S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
-
-PATCHES=( "${FILESDIR}/${P}-mpi.patch" )
-
-DOCS=( README )
-
-src_prepare() {
- cmake_src_prepare
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CUDA=$(usex cuda)
- -DWITH_HPX=$(usex hpx)
- -DWITH_MPI=$(usex mpi)
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCV=$(usex opencv)
- -DWITH_QT5=$(usex qt5)
- -DWITH_SCOTCH=false
- -DWITH_SILO=$(usex silo)
- -DWITH_TYPEMAPS=false
- -DWITH_VISIT=false
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_build doc
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doc/html/* )
- cmake_src_install
-}
-
-src_test() {
- virtx cmake_build check
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/
@ 2020-10-31 9:47 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-10-31 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 784d1c156bcb6ea22bebdf4d2f9b8a64c9625900
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Sep 19 11:05:34 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:47:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784d1c15
sci-libs/libgeodecomp: Bump version to v0.5.0_pre20201009
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/libgeodecomp/Manifest | 1 +
.../files/libgeodecomp-0.5.0_pre20201009-mpi.patch | 292 +++++++++++++++++++++
.../libgeodecomp-0.5.0_pre20201009.ebuild | 82 ++++++
3 files changed, 375 insertions(+)
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 01dad4a3f83..566c35f25be 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1 +1,2 @@
DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
+DIST libgeodecomp-0.5.0_pre20201009.tar.gz 1510212 BLAKE2B fdddf8ef8dd93d0a4860dbde27d1e59bda039b27ff7526a1ddfb6cfe8103f54edd2a847dad2ffa1cdc0c4454b2d48e0df7e5f941ad2a9df9c848868817413b03 SHA512 42a28fcce6408c610265f8cde9c9d46e83519a8ec4a3e6b1f0e6637597b4b9a702c43655f9c1cf5a159012533f2c2e937de21bda2aed54cdd6acd19ec5b4030a
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-mpi.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-mpi.patch
new file mode 100644
index 00000000000..1a1164e342b
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-mpi.patch
@@ -0,0 +1,292 @@
+From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 24 Jan 2020 17:59:48 +0100
+Subject: [PATCH] cmake: Disable mpiruns
+
+The mpiruns will violate the sandboxing. Therefore, disable them including
+scotch.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ CMakeLists.txt | 14 +-
+ CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++-----------------
+ 2 files changed, 121 insertions(+), 131 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed5cc607c3ed..fec488002958 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64")
+ set(AMD64_LINUX true)
+ endif()
+
+-# test if mpirun/mpiexec supports the --oversubscribe flag:
++# use the --oversubscribe flag:
+ if(MPI_FOUND)
+- execute_process(
+- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok
+- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE
+- OUTPUT_QUIET
+- ERROR_QUIET)
+-
+- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0)
+- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
+- else()
+- set(MPIEXEC_OVERSUBSCRIBE_FLAG "")
+- endif()
++ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
+ endif()
+
+ #============= 3. CONFIGURABLE BUILD OPTIONS =========================
+diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
+index 5c717977dbba..146c2bf8bb60 100644
+--- a/CMakeModules/FindSCOTCH.cmake
++++ b/CMakeModules/FindSCOTCH.cmake
+@@ -233,125 +233,125 @@ int main() {
+ ")
+
+ message(STATUS "Performing test SCOTCH_TEST_RUNS")
+- try_run(
+- SCOTCH_TEST_LIB_EXITCODE
+- SCOTCH_TEST_LIB_COMPILED
+- ${CMAKE_CURRENT_BINARY_DIR}
+- ${SCOTCH_TEST_LIB_CPP}
+- CMAKE_FLAGS
+- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
+- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
+- )
+-
+- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
+- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
+- set(SCOTCH_TEST_RUNS TRUE)
+- else()
+- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
+- if (SCOTCH_DEBUG)
+- # Output some variables
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+- endif()
+- endif()
+-
+- # If program does not run, try adding zlib library and test again
+- if(NOT SCOTCH_TEST_RUNS)
+- if (NOT ZLIB_FOUND)
+- find_package(ZLIB)
+- endif()
+-
+- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
+- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
+- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
+-
+- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
+- try_run(
+- SCOTCH_ZLIB_TEST_LIB_EXITCODE
+- SCOTCH_ZLIB_TEST_LIB_COMPILED
+- ${CMAKE_CURRENT_BINARY_DIR}
+- ${SCOTCH_TEST_LIB_CPP}
+- CMAKE_FLAGS
+- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
+- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
+- )
+-
+- # Add zlib flags if required and set test run to 'true'
+- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
+- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
+- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
+- set(SCOTCH_TEST_RUNS TRUE)
+- else()
+- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
+- if (SCOTCH_DEBUG)
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+- endif()
+- endif()
+-
+- endif()
+- endif()
+-
+- if(NOT SCOTCH_TEST_RUNS)
+- if (NOT BZIP2_FOUND)
+- find_package(BZip2)
+- endif()
+-
+- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
+- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
+-
+- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
+- try_run(
+- SCOTCH_BZIP2_TEST_LIB_EXITCODE
+- SCOTCH_BZIP2_TEST_LIB_COMPILED
+- ${CMAKE_CURRENT_BINARY_DIR}
+- ${SCOTCH_TEST_LIB_CPP}
+- CMAKE_FLAGS
+- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
+- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
+- )
+-
+- # Add zlib flags if required and set test run to 'true'
+- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
+- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
+- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
+- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
+- set(SCOTCH_TEST_RUNS TRUE)
+- else()
+- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
+- if (SCOTCH_DEBUG)
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+- endif()
+- endif()
+- endif()
+- endif()
++ # try_run(
++ # SCOTCH_TEST_LIB_EXITCODE
++ # SCOTCH_TEST_LIB_COMPILED
++ # ${CMAKE_CURRENT_BINARY_DIR}
++ # ${SCOTCH_TEST_LIB_CPP}
++ # CMAKE_FLAGS
++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
++ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
++ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
++ # )
++
++ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
++ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
++ # set(SCOTCH_TEST_RUNS TRUE)
++ # else()
++ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
++ # if (SCOTCH_DEBUG)
++ # # Output some variables
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
++ # endif()
++ # endif()
++
++ # # If program does not run, try adding zlib library and test again
++ # if(NOT SCOTCH_TEST_RUNS)
++ # if (NOT ZLIB_FOUND)
++ # find_package(ZLIB)
++ # endif()
++
++ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
++ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
++ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
++
++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
++ # try_run(
++ # SCOTCH_ZLIB_TEST_LIB_EXITCODE
++ # SCOTCH_ZLIB_TEST_LIB_COMPILED
++ # ${CMAKE_CURRENT_BINARY_DIR}
++ # ${SCOTCH_TEST_LIB_CPP}
++ # CMAKE_FLAGS
++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
++ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
++ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
++ # )
++
++ # # Add zlib flags if required and set test run to 'true'
++ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
++ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
++ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
++ # set(SCOTCH_TEST_RUNS TRUE)
++ # else()
++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
++ # if (SCOTCH_DEBUG)
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
++ # endif()
++ # endif()
++
++ # endif()
++ # endif()
++
++ # if(NOT SCOTCH_TEST_RUNS)
++ # if (NOT BZIP2_FOUND)
++ # find_package(BZip2)
++ # endif()
++
++ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
++ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
++ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
++
++ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
++ # try_run(
++ # SCOTCH_BZIP2_TEST_LIB_EXITCODE
++ # SCOTCH_BZIP2_TEST_LIB_COMPILED
++ # ${CMAKE_CURRENT_BINARY_DIR}
++ # ${SCOTCH_TEST_LIB_CPP}
++ # CMAKE_FLAGS
++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
++ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
++ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
++ # )
++
++ # # Add zlib flags if required and set test run to 'true'
++ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
++ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
++ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
++ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
++ # set(SCOTCH_TEST_RUNS TRUE)
++ # else()
++ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
++ # if (SCOTCH_DEBUG)
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
++ # endif()
++ # endif()
++ # endif()
++ # endif()
+
+ endif()
+ endif()
+--
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
new file mode 100644
index 00000000000..70aa2285270
--- /dev/null
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake cuda virtualx
+
+MY_COMMIT="6848b3a17b359e03585e56dd1f37dc7c71136114"
+
+DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
+HOMEPAGE="
+ http://www.libgeodecomp.org
+ https://github.com/STEllAR-GROUP/libgeodecomp"
+SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cuda doc hpx mpi opencl opencv qt5 silo"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ app-text/texlive
+ media-gfx/graphviz
+ )"
+RDEPEND="dev-libs/boost"
+DEPEND="${RDEPEND}
+ ~dev-libs/libflatarray-0.4.0_pre20201009
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ hpx? ( sys-cluster/hpx )
+ mpi? ( virtual/mpi )
+ opencl? ( virtual/opencl )
+ opencv? ( media-libs/opencv )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )
+ silo? ( sci-libs/silo )"
+
+S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}/${P}-mpi.patch" )
+
+DOCS=( README )
+
+src_prepare() {
+ cmake_src_prepare
+ use cuda && cuda_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_CUDA=$(usex cuda)
+ -DWITH_HPX=$(usex hpx)
+ -DWITH_MPI=$(usex mpi)
+ -DWITH_OPENCL=$(usex opencl)
+ -DWITH_OPENCV=$(usex opencv)
+ -DWITH_QT5=$(usex qt5)
+ -DWITH_SCOTCH=false
+ -DWITH_SILO=$(usex silo)
+ -DWITH_TYPEMAPS=false
+ -DWITH_VISIT=false
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_build doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/* )
+ cmake_src_install
+}
+
+src_test() {
+ virtx cmake_build check
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/
@ 2020-12-29 1:54 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-12-29 1:54 UTC (permalink / raw
To: gentoo-commits
commit: f8cc16d8d29ac37adc78c77d28956ce1bd20cd80
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon Dec 28 14:08:16 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 01:54:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8cc16d8
sci-libs/libgeodecomp: Fix build with OpenCV enabled
Closes: https://bugs.gentoo.org/762196
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/18850
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libgeodecomp-0.5.0_pre20201009-opencv.patch | 186 +++++++++++++++++++++
.../libgeodecomp-0.5.0_pre20201009.ebuild | 5 +-
2 files changed, 190 insertions(+), 1 deletion(-)
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-opencv.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-opencv.patch
new file mode 100644
index 00000000000..0a063281249
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-opencv.patch
@@ -0,0 +1,186 @@
+From 3a20ca303ccc8d9d7cfd9787b392f1436d266243 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Mon, 28 Dec 2020 15:03:16 +0100
+Subject: [PATCH] cmake: Fix build with OpenCV
+
+The FindOpenCV module assumes that OpenCV in installed into a separate
+directory which makes sense for cluster machines etc.
+
+However, on Gentoo OpenCV is installed by portage and the corresponding Cmake
+module can be used directly.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ CMakeModules/FindOpenCV.cmake | 160 ----------------------------------
+ 1 file changed, 160 deletions(-)
+ delete mode 100644 CMakeModules/FindOpenCV.cmake
+
+diff --git a/CMakeModules/FindOpenCV.cmake b/CMakeModules/FindOpenCV.cmake
+deleted file mode 100644
+index 68d629da5a4d..000000000000
+--- a/CMakeModules/FindOpenCV.cmake
++++ /dev/null
+@@ -1,160 +0,0 @@
+-###########################################################
+-# Find OpenCV Library
+-# See http://sourceforge.net/projects/opencvlibrary/
+-#----------------------------------------------------------
+-#
+-## 1: Setup:
+-# The following variables are optionally searched for defaults
+-# OpenCV_DIR: Base directory of OpenCv tree to use.
+-#
+-## 2: Variable
+-# The following are set after configuration is done:
+-#
+-# OpenCV_FOUND
+-# OpenCV_LIBS
+-# OpenCV_INCLUDE_DIR
+-# OpenCV_VERSION (OpenCV_VERSION_MAJOR, OpenCV_VERSION_MINOR, OpenCV_VERSION_PATCH)
+-#
+-#
+-# Deprecated variable are used to maintain backward compatibility with
+-# the script of Jan Woetzel (2006/09): www.mip.informatik.uni-kiel.de/~jw
+-# OpenCV_INCLUDE_DIRS
+-# OpenCV_LIBRARIES
+-# OpenCV_LINK_DIRECTORIES
+-#
+-## 3: Version
+-#
+-# 2010/04/07 Benoit Rat, Correct a bug when OpenCVConfig.cmake is not found.
+-# 2010/03/24 Benoit Rat, Add compatibility for when OpenCVConfig.cmake is not found.
+-# 2010/03/22 Benoit Rat, Creation of the script.
+-#
+-#
+-# tested with:
+-# - OpenCV 2.1: MinGW, MSVC2008
+-# - OpenCV 2.0: MinGW, MSVC2008, GCC4
+-#
+-#
+-## 4: Licence:
+-#
+-# LGPL 2.1 : GNU Lesser General Public License Usage
+-# Alternatively, this file may be used under the terms of the GNU Lesser
+-
+-# General Public License version 2.1 as published by the Free Software
+-# Foundation and appearing in the file LICENSE.LGPL included in the
+-# packaging of this file. Please review the following information to
+-# ensure the GNU Lesser General Public License version 2.1 requirements
+-# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-#
+-#----------------------------------------------------------
+-
+-
+-find_path(OpenCV_DIR "OpenCVConfig.cmake" /usr/share/OpenCV DOC "Root directory of OpenCV")
+-
+-##====================================================
+-## Find OpenCV libraries
+-##----------------------------------------------------
+-if(EXISTS "${OpenCV_DIR}")
+-
+- #When its possible to use the Config script use it.
+- if(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+- ## Include the standard CMake script
+- include("${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+- ## Search for a specific version
+- set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+-
+- #Otherwise it try to guess it.
+- else(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+- set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux)
+- find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "")
+- if(EXISTS ${OpenCV_INCLUDE_DIR})
+- include_directories(${OpenCV_INCLUDE_DIR})
+- endif(EXISTS ${OpenCV_INCLUDE_DIR})
+-
+- #Find OpenCV version by looking at cvver.h
+- file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
+- string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP})
+- string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP})
+- string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP})
+- set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE)
+- set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+-
+- endif(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+-
+-
+-
+- ## Initiate the variable before the loop
+- set(GLOBAL OpenCV_LIBS "")
+- set(OpenCV_FOUND_TMP true)
+-
+- ## Loop over each components
+- foreach(__CVLIB ${OPENCV_LIB_COMPONENTS})
+-
+- find_library(OpenCV_${__CVLIB}_LIBRARY_DEBUG NAMES "${__CVLIB}${CVLIB_SUFFIX}d" "lib${__CVLIB}${CVLIB_SUFFIX}d" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH)
+- find_library(OpenCV_${__CVLIB}_LIBRARY_RELEASE NAMES "${__CVLIB}${CVLIB_SUFFIX}" "lib${__CVLIB}${CVLIB_SUFFIX}" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH)
+-
+- #Remove the cache value
+- set(OpenCV_${__CVLIB}_LIBRARY "" CACHE STRING "" FORCE)
+-
+- #both debug/release
+- if(OpenCV_${__CVLIB}_LIBRARY_DEBUG AND OpenCV_${__CVLIB}_LIBRARY_RELEASE)
+- set(OpenCV_${__CVLIB}_LIBRARY debug ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} optimized ${OpenCV_${__CVLIB}_LIBRARY_RELEASE} CACHE STRING "" FORCE)
+- #only debug
+- elseif(OpenCV_${__CVLIB}_LIBRARY_DEBUG)
+- set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} CACHE STRING "" FORCE)
+- #only release
+- elseif(OpenCV_${__CVLIB}_LIBRARY_RELEASE)
+- set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_RELEASE} CACHE STRING "" FORCE)
+- #no library found
+- else()
+- set(OpenCV_FOUND_TMP false)
+- endif()
+-
+- #Add to the general list
+- if(OpenCV_${__CVLIB}_LIBRARY)
+- set(OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_${__CVLIB}_LIBRARY})
+- endif(OpenCV_${__CVLIB}_LIBRARY)
+-
+- endforeach(__CVLIB)
+-
+-
+- set(OpenCV_FOUND ${OpenCV_FOUND_TMP} CACHE BOOL "" FORCE)
+-
+-
+-else(EXISTS "${OpenCV_DIR}")
+- set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable")
+-endif(EXISTS "${OpenCV_DIR}")
+-##====================================================
+-
+-
+-##====================================================
+-## Print message
+-##----------------------------------------------------
+-if(NOT OpenCV_FOUND)
+- # make FIND_PACKAGE friendly
+- if(NOT OpenCV_FIND_QUIETLY)
+- if(OpenCV_FIND_REQUIRED)
+- message(FATAL_ERROR "OpenCV required but some headers or libs not found. ${ERR_MSG}")
+- else(OpenCV_FIND_REQUIRED)
+- message(STATUS "WARNING: OpenCV was not found. ${ERR_MSG}")
+- endif(OpenCV_FIND_REQUIRED)
+- endif(NOT OpenCV_FIND_QUIETLY)
+-endif(NOT OpenCV_FOUND)
+-##====================================================
+-
+-
+-##====================================================
+-## Backward compatibility
+-##----------------------------------------------------
+-if(OpenCV_FOUND)
+- option(OpenCV_BACKWARD_COMPA "Add some variable to make this script compatible with the other version of FindOpenCV.cmake" false)
+- if(OpenCV_BACKWARD_COMPA)
+- find_path(OpenCV_INCLUDE_DIRS "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory")
+- find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory")
+- set(OpenCV_LIBRARIES "${OpenCV_LIBS}" CACHE STRING "" FORCE)
+- endif(OpenCV_BACKWARD_COMPA)
+-endif(OpenCV_FOUND)
+-##====================================================
+--
+2.26.2
+
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
index 70aa2285270..3b63da93513 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
-PATCHES=( "${FILESDIR}/${P}-mpi.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-mpi.patch"
+ "${FILESDIR}/${P}-opencv.patch"
+)
DOCS=( README )
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-29 1:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-31 9:47 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/, sci-libs/libgeodecomp/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-12-29 1:54 Sam James
2020-10-31 9:47 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-03-28 14:21 Joonas Niilola
2020-01-21 20:47 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox