Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-05-24 19:02:54 +00:00
4 changed files with 4 additions and 3 deletions

View File

@@ -1 +1 @@
DIST mupen64plus-qt-1.14.tar.gz 573526 BLAKE2B f81681861de61db9e68eb80941e97644a2e903b221c470e981c9e7f39e3cc720f59e57a08a7d5346b99ae963d6639c275c98f6519df9a203b0aaf567e9169451 SHA512 c4260a4d01362c4aa6c921bd816dd4ea6bae03380ad461613fffdcb877c09b0f8cc7e3e954842c1dd533ffdc546086b943ddf17c3c133c0b772cf62111ca01ea DIST mupen64plus-qt-1.15.tar.gz 573009 BLAKE2B 9db7c5c7fefa99466933e4526338487b138eb970595d0ac92aedb1649e9786785b2472b7716cd24080e99cddda9d434207d2387515a62f6b2c111076bdcb10ed SHA512 f7abb23b401febbf60cfb04bcfe37047ce2e323241665aaae06874903da33c0dedf405809a8af193f82f1dc4537adcbcd480f86b5dad5d3af635d1eb00fb6aae

View File

@@ -19,6 +19,7 @@ SLOT="0"
DEPEND=" DEPEND="
~sys-cluster/Graph500-1.2 ~sys-cluster/Graph500-1.2
sys-cluster/psort
sys-cluster/usort sys-cluster/usort
virtual/mpi virtual/mpi
" "

View File

@@ -43,7 +43,7 @@ DOCS=( README.md CHANGELOG docs/libROM_Design_and_Theory.pdf )
src_configure() { src_configure() {
local mycmakeargs=( local mycmakeargs=(
-DBUILD_STATIC=OFF -DBUILD_STATIC=OFF
-DUSE_MFEM=OFF -DUSE_MFEM=$(usex mfem)
) )
cmake_src_configure cmake_src_configure
} }

View File

@@ -113,7 +113,7 @@ src_unpack() {
} }
src_prepare() { src_prepare() {
rm src/mlpack/tescatch.hpp rm src/mlpack/tests/catch.hpp || die
rm -r src/mlpack/core/std_backport || die rm -r src/mlpack/core/std_backport || die
rm -r src/mlpack/core/cereal/{pair_associative_container,unordered_map}.hpp || die rm -r src/mlpack/core/cereal/{pair_associative_container,unordered_map}.hpp || die