commit: 5a757d4da3404035dc159c8942fe336e281c1885
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 20:32:05 2016 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 20:32:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5a757d4d
sys-cluster/lustre: Fix install without modules
Package-Manager: portage-2.3.0_rc1
sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch | 12 ++++++++++++
sys-cluster/lustre/lustre-2.8.0.ebuild | 4 ++--
sys-cluster/lustre/lustre-9999.ebuild | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch
b/sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch
new file mode 100644
index 0000000..4bb353c
--- /dev/null
+++ b/sys-cluster/lustre/files/lustre-do-not-include-udef.h.patch
@@ -0,0 +1,12 @@
+diff -urN lustre-2.8.0.orig/config/lustre-build.m4
lustre-2.8.0/config/lustre-build.m4
+--- lustre-2.8.0.orig/config/lustre-build.m4 2016-06-12 23:18:39.992712332
+0300
++++ lustre-2.8.0/config/lustre-build.m4 2016-06-12 23:21:39.928433319
+0300
+@@ -266,7 +266,7 @@
+ #
+ AC_DEFUN([LB_CONFIG_HEADERS], [
+ AC_CONFIG_HEADERS([config.h])
+-CPPFLAGS="-include $PWD/undef.h -include $PWD/config.h $CPPFLAGS"
++CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
+ EXTRA_KCFLAGS="-include $PWD/undef.h -include $PWD/config.h $EXTRA_KCFLAGS"
+ AC_SUBST(EXTRA_KCFLAGS)
+ ]) # LB_CONFIG_HEADERS
diff --git a/sys-cluster/lustre/lustre-2.8.0.ebuild
b/sys-cluster/lustre/lustre-2.8.0.ebuild
index 4a59000..4fab54d 100644
--- a/sys-cluster/lustre/lustre-2.8.0.ebuild
+++ b/sys-cluster/lustre/lustre-2.8.0.ebuild
@@ -43,6 +43,8 @@ REQUIRED_USE="
modules? ( client )
modules? ( server )"
+PATCHES=( "${FILESDIR}/lustre-do-not-include-udef.h.patch" )
+
pkg_setup() {
filter-mfpmath sse
filter-mfpmath i386
@@ -83,9 +85,7 @@ src_configure() {
econf \
${myconf} \
--without-ldiskfs \
- --disable-ldiskfs-build \
--with-linux="${KERNEL_DIR}" \
- --with-linux-release="${KV_FULL}" \
$(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 4a59000..4fab54d 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -43,6 +43,8 @@ REQUIRED_USE="
modules? ( client )
modules? ( server )"
+PATCHES=( "${FILESDIR}/lustre-do-not-include-udef.h.patch" )
+
pkg_setup() {
filter-mfpmath sse
filter-mfpmath i386
@@ -83,9 +85,7 @@ src_configure() {
econf \
${myconf} \
--without-ldiskfs \
- --disable-ldiskfs-build \
--with-linux="${KERNEL_DIR}" \
- --with-linux-release="${KV_FULL}" \
$(use_enable client) \
$(use_enable utils) \
$(use_enable modules) \
