[gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/

[Alexey Shvetsov]

commit:     01fcdaf7e9523dc74e1c7ed47173215791406ca5
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 18:43:10 2016 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 18:43:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=01fcdaf7

sys-cluster/lustre: enable DLC for lustre

Package-Manager: portage-2.3.0_rc1

 sys-cluster/lustre/lustre-2.8.54.ebuild |  4 +++-
 sys-cluster/lustre/lustre-9999.ebuild   | 10 ++++++++--
 sys-cluster/lustre/metadata.xml         |  9 +++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/lustre/lustre-2.8.54.ebuild 
b/sys-cluster/lustre/lustre-2.8.54.ebuild
index 2a976b2..24b1bc2 100644
--- a/sys-cluster/lustre/lustre-2.8.54.ebuild
+++ b/sys-cluster/lustre/lustre-2.8.54.ebuild
@@ -25,10 +25,11 @@ 
EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +utils +modules server readline tests"
+IUSE="+client +utils +modules +dlc server readline tests"
 
 RDEPEND="
        virtual/awk
+       dlc? ( dev-libs/libyaml )
        readline? ( sys-libs/readline:0 )
        server? (
                >=sys-kernel/spl-0.6.1
@@ -95,6 +96,7 @@ src_configure() {
                ${myconf} \
                --without-ldiskfs \
                --with-linux="${KERNEL_DIR}" \
+               $(use_enable dlc) \
                $(use_enable client) \
                $(use_enable utils) \
                $(use_enable modules) \

diff --git a/sys-cluster/lustre/lustre-9999.ebuild 
b/sys-cluster/lustre/lustre-9999.ebuild
index c45ea6f..d928ee3 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -25,10 +25,11 @@ 
EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +utils +modules server readline tests"
+IUSE="+client +utils +modules +dlc server readline tests"
 
 RDEPEND="
        virtual/awk
+       dlc? ( dev-libs/libyaml )
        readline? ( sys-libs/readline:0 )
        server? (
                >=sys-kernel/spl-0.6.1
@@ -43,6 +44,10 @@ REQUIRED_USE="
        client? ( modules )
        server? ( modules )"
 
+PATCHES=(
+       "${FILESDIR}/0008-Fix-build-error-with-gcc-6.1.patch"
+       )
+
 pkg_setup() {
        filter-mfpmath sse
        filter-mfpmath i386
@@ -53,7 +58,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       if [ ! -z ${#PATCHES[@]} ]; then
+       if [ ! -z ${#PATCHES[0]} ]; then
                epatch ${PATCHES[@]}
        fi
        eapply_user
@@ -84,6 +89,7 @@ src_configure() {
                ${myconf} \
                --without-ldiskfs \
                --with-linux="${KERNEL_DIR}" \
+               $(use_enable dlc) \
                $(use_enable client) \
                $(use_enable utils) \
                $(use_enable modules) \

diff --git a/sys-cluster/lustre/metadata.xml b/sys-cluster/lustre/metadata.xml
index 026d877..04a5327 100644
--- a/sys-cluster/lustre/metadata.xml
+++ b/sys-cluster/lustre/metadata.xml
@@ -9,9 +9,10 @@
 Lustre is a parallel distributed file system, generally used for large scale 
cluster computing
 </longdescription>
   <use>
-    <flag name="client">Enable kernel client modules</flag>
-    <flag name="server">Enable kernels server modules</flag>
-    <flag name="utils">Enable lustre utils</flag>
-    <flag name="tests">Enable installation of tests</flag>
+         <flag name="client">Enable kernel client modules</flag>
+         <flag name="dlc">Enable Dynamic LNET Configuration</flag>
+         <flag name="server">Enable kernels server modules</flag>
+         <flag name="utils">Enable lustre utils</flag>
+         <flag name="tests">Enable installation of tests</flag>
   </use>
 </pkgmetadata>