subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sci\-libs\/silo\/files\/, sci\-libs\/silo\/"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

2022-10-16 Thread Andreas Sturmlechner

commit: 2ec5dd82dd63f265822a2e4e37aabc722d1bcac0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 16 15:09:25 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 16 15:10:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec5dd82

sci-libs/silo: Fix configure w/o Qt binaries in PATH, drop which usage

Closes: https://bugs.gentoo.org/851018
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/silo/files/silo-4.11-qtbindir.patch | 43 
 sci-libs/silo/silo-4.11-r1.ebuild|  6 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/sci-libs/silo/files/silo-4.11-qtbindir.patch 
b/sci-libs/silo/files/silo-4.11-qtbindir.patch
new file mode 100644
index ..70a62a9b8ec8
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-qtbindir.patch
@@ -0,0 +1,43 @@
+--- a/configure2021-09-11 00:22:52.0 +0200
 b/configure2022-10-16 17:03:52.235916191 +0200
+@@ -25725,7 +25725,10 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt" >&5
+ $as_echo_n "checking for Qt... " >&6; }
+   # If we have Qt5 or later in the path, we're golden
+-  ver=`qmake --version | grep -o "Qt version ."`
++  if [[ -z $QMAKE ]]; then
++QMAKE=qmake
++  fi
++  ver=`$QMAKE --version | grep -o "Qt version ."`
+   if test "$ver" ">" "Qt version 4"; then
+ have_qt=yes
+ # This pro file dumps qmake's variables, but it only works on Qt 5 or 
later
+@@ -25750,21 +25753,21 @@
+ percent.commands = @echo -n "\$(\$(@))\ "
+ QMAKE_EXTRA_TARGETS += percent
+ EOF
+-qmake $am_have_qt_pro -o $am_have_qt_makefile
++$QMAKE $am_have_qt_pro -o $am_have_qt_makefile
+ QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS 
INCPATH | tr -d '"'`
+ QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS`
+ rm $am_have_qt_pro $am_have_qt_makefile
+ rmdir $am_have_qt_dir
+ 
+ # Look for specific tools in $PATH
+-QT_MOC=`which moc`
+-QT_UIC=`which uic`
+-QT_RCC=`which rcc`
+-QT_LRELEASE=`which lrelease`
+-QT_LUPDATE=`which lupdate`
++QT_MOC=$QT_BIN_DIR/moc
++QT_UIC=$QT_BIN_DIR/uic
++QT_RCC=$QT_BIN_DIR/rcc
++QT_LRELEASE=$QT_BIN_DIR/lrelease
++QT_LUPDATE=$QT_BIN_DIR/lupdate
+ 
+ # Get Qt version from qmake
+-QT_DIR=`qmake --version | grep -o -E /.+`
++QT_DIR=`$QMAKE --version | grep -o -E /.+`
+ 
+ # All variables are defined, report the result
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_qt:

diff --git a/sci-libs/silo/silo-4.11-r1.ebuild 
b/sci-libs/silo/silo-4.11-r1.ebuild
index 3372e92a569c..bfae9dec06c8 100644
--- a/sci-libs/silo/silo-4.11-r1.ebuild
+++ b/sci-libs/silo/silo-4.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic fortran-2
+inherit flag-o-matic fortran-2 qmake-utils
 
 DESCRIPTION="A mesh and field I/O library and scientific database"
 HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo;
@@ -25,6 +25,7 @@ RDEPEND="
hdf5? ( sci-libs/hdf5 )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=(
"${FILESDIR}"/${P}-hdf5.patch
@@ -32,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-tests.patch
"${FILESDIR}"/${P}-testsuite-python-write.patch
"${FILESDIR}"/${P}-widgets.patch
+   "${FILESDIR}"/${P}-qtbindir.patch
 )
 
 src_configure() {
@@ -39,6 +41,8 @@ src_configure() {
# see https://github.com/LLNL/Silo/issues/234
append-fflags $(test-flags-F77 -fallow-argument-mismatch)
 
+   QMAKE=$(qt5_get_bindir)/qmake \
+   QT_BIN_DIR=$(qt5_get_bindir) \
econf \
--enable-install-lite-headers \
--enable-shared \

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

2022-01-19 Thread Ionen Wolkens

commit: 4e9ea438490364ebbe1bdc6e83b9f7e77c1f26ca
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 19 21:40:34 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 19 21:43:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ea438

sci-libs/silo: fix build with minimal QT

Closes: https://bugs.gentoo.org/831361
Signed-off-by: Ionen Wolkens  gentoo.org>

 sci-libs/silo/files/silo-4.11-widgets.patch | 11 +++
 sci-libs/silo/silo-4.11-r1.ebuild   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/sci-libs/silo/files/silo-4.11-widgets.patch 
b/sci-libs/silo/files/silo-4.11-widgets.patch
new file mode 100644
index ..46ef1834ca22
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-widgets.patch
@@ -0,0 +1,11 @@
+On a minimal QT installation, widgets may not necessarily be
+added and it needs to be explicitely done. Modifying ./configure
+directly given tarball lacks some files to run eautoreconf.
+
+https://bugs.gentoo.org/831361
+--- a/configure
 b/configure
+@@ -25748,2 +25748,3 @@
+ qtHaveModule(testlib):   QT += testlib
++qtHaveModule(widgets):   QT += widgets
+ percent.target = %

diff --git a/sci-libs/silo/silo-4.11-r1.ebuild 
b/sci-libs/silo/silo-4.11-r1.ebuild
index f4c780ba2a3c..3372e92a569c 100644
--- a/sci-libs/silo/silo-4.11-r1.ebuild
+++ b/sci-libs/silo/silo-4.11-r1.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${P}-test-disable-largefile.patch
"${FILESDIR}"/${P}-tests.patch
"${FILESDIR}"/${P}-testsuite-python-write.patch
+   "${FILESDIR}"/${P}-widgets.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

2018-03-13 Thread Andreas Sturmlechner

commit: 7d9eacdfc758857f89923f5b57e9f1b795186dd4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar 12 19:50:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:33:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9eacdf

sci-libs/silo: Drop old

Closes: https://bugs.gentoo.org/645434
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-libs/silo/Manifest  |  1 -
 sci-libs/silo/files/silo-4.9.1-qtlibs.patch | 66 -
 sci-libs/silo/files/silo-4.9.1-tests.patch  | 11 -
 sci-libs/silo/silo-4.10.2.ebuild| 38 -
 sci-libs/silo/silo-4.9.1.ebuild | 38 -
 5 files changed, 154 deletions(-)

diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index f8335b91fb0..b6f65c970d1 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,2 +1 @@
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 
6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c
 SHA512 
8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
-DIST silo-4.9.1.tar.gz 12038537 BLAKE2B 
4c5bf6a4390333d659df96a302f6ee8f7a81325194cb6853c278e94b6c229da964103874c02fcb4b4f9f4985cf9b023ee3a553e1ca6237ccdbc5e7d9f64c1906
 SHA512 
512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83

diff --git a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch 
b/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
deleted file mode 100644
index e8fc4284cac..000
--- a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure
 silo-4.9.1-old/configure   2014-01-18 23:19:15.755030306 +0100
-+++ silo-4.9.1-new/configure   2014-01-18 23:20:52.595031159 +0100
-@@ -27503,7 +27503,7 @@
- ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-  sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-   fi
--  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore 
-lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
- else
-   # Use cached value or do search, starting with suggestions from
-   # the command line
-@@ -27577,7 +27577,7 @@
-   ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
- fi
--ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore 
-lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-   else
- # There is no valid definition for $QTDIR as Trolltech likes to see it
- ax_qt_dir=
-@@ -27589,7 +27589,7 @@
- ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
-  sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
-   fi
--  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore 
-lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
- else
-   # Normally, when there is no traditional Trolltech installation,
-   # the library is installed in a place where the linker finds it
-@@ -27607,7 +27607,7 @@
-   # See if we find the library without any special options.
-   # Don't add top $LIBS permanently yet
-   ax_save_LIBS="$LIBS"
--  LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi 
$X_EXTRA_LIBS"
-+  LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext 
-lXmu -lXt -lXi $X_EXTRA_LIBS"
-   ax_qt_LIBS="$LIBS"
-   ax_save_CXXFLAGS="$CXXFLAGS"
-   CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt 
-I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
-@@ -27668,7 +27668,7 @@
- # That did not work. Try the multi-threaded version
- echo "Non-critical error, please neglect the above." >&5
- ax_qt_lib=qt-mt
--LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi 
$X_EXTRA_LIBS"
-+LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext 
-lXmu -lXt -lXi $X_EXTRA_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27726,7 +27726,7 @@
-   # That did not work. Try the OpenGL version
-   echo "Non-critical error, please neglect the above." >&5
-   ax_qt_lib=qt-gl
--  LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi 
$X_EXTRA_LIBS"
-+  LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

2018-01-24 Thread Slawek Lis

commit: 8b1b556348dd386b205af3359510a169091f8c6b
Author: Slawomir Lis  gentoo  org>
AuthorDate: Wed Jan 24 10:12:43 2018 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Wed Jan 24 10:12:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1b5563

sci-libs/silo: created patches to build with qt5

As there is no recent version available upstream, I've created
a patch to build with qt5.

Reported-In: https://bugs.gentoo.org/645434
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 sci-libs/silo/files/silo-4.10.2-qt5.patch| 44 +
 sci-libs/silo/files/silo-4.10.2-qtlibs.patch | 48 +---
 sci-libs/silo/silo-4.10.2-r1.ebuild  | 40 +++
 3 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/sci-libs/silo/files/silo-4.10.2-qt5.patch 
b/sci-libs/silo/files/silo-4.10.2-qt5.patch
new file mode 100644
index 000..1e1fe8803a3
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-qt5.patch
@@ -0,0 +1,44 @@
+--- tools/silex/SiloFile.h.orig2018-01-24 11:01:23.354705068 +0100
 tools/silex/SiloFile.h 2018-01-24 11:01:34.843705761 +0100
+@@ -61,6 +61,8 @@
+ #include 
+ using std::vector;
+ 
++#define toAscii toLatin1
++
+ // 

+ //  Class:  SiloDir
+ //
+--- tools/silex/main.cpp.orig  2018-01-24 11:02:21.201708556 +0100
 tools/silex/main.cpp   2018-01-24 11:02:34.146709336 +0100
+@@ -58,7 +58,7 @@
+ #include 
+ 
+ #ifndef Q_WS_MACX
+-#include "qwindowsstyle.h"
++//#include "qwindowsstyle.h"
+ #endif
+ #include "qfiledialog.h"
+ #include "qstring.h"
+@@ -91,7 +91,7 @@
+ QApplication::setColorSpec(QApplication::ManyColor);
+ QApplication a(argc, argv);
+ #ifndef Q_WS_MACX
+-a.setStyle(new QWindowsStyle);
++//a.setStyle(new QWindowsStyle);
+ #endif
+ Explorer *w = 0;
+ if (argc > 1)
+--- tools/silex/SiloView.cpp.orig  2018-01-24 11:03:13.775711725 +0100
 tools/silex/SiloView.cpp   2018-01-24 11:03:30.032712706 +0100
+@@ -109,8 +109,8 @@
+ dirTreeView->OpenRootDir();
+ dirView->Set(silo->root);
+ 
+-dirTreeView->header()->setResizeMode(QHeaderView::Interactive);
+-dirView->header()->setResizeMode(QHeaderView::Interactive);
++dirTreeView->header()->setSectionResizeMode(QHeaderView::Interactive);
++dirView->header()->setSectionResizeMode(QHeaderView::Interactive);
+ }
+ }
+ 

diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch 
b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
index e8fc4284cac..ecd5297c281 100644
--- a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
+++ b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
@@ -1,66 +1,78 @@
-diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure
 silo-4.9.1-old/configure   2014-01-18 23:19:15.755030306 +0100
-+++ silo-4.9.1-new/configure   2014-01-18 23:20:52.595031159 +0100
-@@ -27503,7 +27503,7 @@
+--- configure.orig 2018-01-24 10:50:10.458664501 +0100
 configure  2018-01-24 10:50:42.967666461 +0100
+@@ -27541,7 +27541,7 @@
  ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
   sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
fi
 -  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore 
-lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core 
-lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
  else
# Use cached value or do search, starting with suggestions from
# the command line
-@@ -27577,7 +27577,7 @@
+@@ -27615,7 +27615,7 @@
ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
 sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
  fi
 -ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore 
-lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core 
-lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
else
  # There is no valid definition for $QTDIR as Trolltech likes to see it
  ax_qt_dir=
-@@ -27589,7 +27589,7 @@
+@@ -27627,7 +27627,7 @@
  ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
   sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
fi
 -  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 
-lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore 
-lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++  ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core 
-lQt5Gui -lQt5Widgets -lX11

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

2017-07-28 Thread Slawek Lis

commit: aef8cfc47a055dcaba51f431a4580256beb262b1
Author: Slawomir Lis  gentoo  org>
AuthorDate: Fri Jul 28 07:01:11 2017 +
Commit: Slawek Lis  gentoo  org>
CommitDate: Fri Jul 28 07:01:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef8cfc4

sci-libs/silo: added patch to fix hdf5 mpi compile problem

Bug reported: 625794

Reported-by: deference  null.net
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-libs/silo/files/silo-4.10.2-mpiposix.patch | 53 ++
 sci-libs/silo/silo-4.10.2.ebuild   |  3 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch 
b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
new file mode 100644
index 000..30a3f910b19
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
@@ -0,0 +1,53 @@
+--- src/hdf5_drv/silo_hdf5.c.orig  2017-07-28 08:52:09.026638768 +0200
 src/hdf5_drv/silo_hdf5.c   2017-07-28 09:00:12.306635882 +0200
+@@ -4752,18 +4752,19 @@
+ }
+ 
+ /* default HDF5 mpi drivers */
+-case DB_FILE_OPTS_H5_DEFAULT_MPIP:
+-{
+-#ifdef H5_HAVE_PARALLEL
+-h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
+-#else
+-H5Pclose(retval);
+-return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
+-#endif
+-break;
+-}
++//case DB_FILE_OPTS_H5_DEFAULT_MPIP:
++//{
++//#ifdef H5_HAVE_PARALLEL
++//h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
++//#else
++//H5Pclose(retval);
++//return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
++//#endif
++//break;
++//}
+ 
+ case DB_FILE_OPTS_H5_DEFAULT_MPIO:
++  case DB_FILE_OPTS_H5_DEFAULT_MPIP:
+ {
+ #ifdef H5_HAVE_PARALLEL
+ MPI_Info info;
+@@ -5069,15 +5070,15 @@
+ if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS)))
+ use_gpfs_hints = FALSE;
+ 
+-if (vfd == DB_H5VFD_MPIO)
++//if (vfd == DB_H5VFD_MPIO)
+ {
+ h5status |= H5Pset_fapl_mpio(retval, mpi_comm, 
mpi_info);
+ if (created_info) MPI_Info_free(_info);
+ }
+-else
+-{
+-h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, 
use_gpfs_hints);
+-}
++//else
++//{
++//h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, 
use_gpfs_hints);
++//}
+ #else 
+ H5Pclose(retval);
+ return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);

diff --git a/sci-libs/silo/silo-4.10.2.ebuild b/sci-libs/silo/silo-4.10.2.ebuild
index e222f939d51..0c77dba873a 100644
--- a/sci-libs/silo/silo-4.10.2.ebuild
+++ b/sci-libs/silo/silo-4.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}"
 src_prepare() {
epatch "${FILESDIR}/${P}-qtlibs.patch"
epatch "${FILESDIR}/${P}-tests.patch"
+   epatch "${FILESDIR}/${P}-mpiposix.patch"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/

5 matches

Site Navigation

Mail list logo

Footer information