1 |
commit: 8fd1ba903fa8e42d6347d1ebd85feb11f32a12d9 |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 31 11:20:36 2013 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 31 11:23:45 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8fd1ba90 |
7 |
|
8 |
Fix autogen |
9 |
|
10 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
11 |
|
12 |
--- |
13 |
sys-cluster/lustre/ChangeLog | 3 --- |
14 |
sys-cluster/lustre/lustre-9999.ebuild | 8 ++++---- |
15 |
2 files changed, 4 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/lustre/ChangeLog b/sys-cluster/lustre/ChangeLog |
18 |
index 25bdde5..16471dd 100644 |
19 |
--- a/sys-cluster/lustre/ChangeLog |
20 |
+++ b/sys-cluster/lustre/ChangeLog |
21 |
@@ -2,9 +2,6 @@ |
22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
- 31 Mar 2013; Alexey Shvetsov <alexxy@g.o> lustre-9999.ebuild: |
26 |
- build was renamed to config |
27 |
- |
28 |
31 Mar 2013; Alexey Shvetsov <alexxy@g.o> |
29 |
+files/0001-LU-2982-build-make-AC-check-for-linux-arch-sandbox-f.patch, |
30 |
+files/0002-LU-2800-libcfs-use-sock_alloc_file-instead-of-sock_m.patch, |
31 |
|
32 |
diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild |
33 |
index 64bee30..3457fbf 100644 |
34 |
--- a/sys-cluster/lustre/lustre-9999.ebuild |
35 |
+++ b/sys-cluster/lustre/lustre-9999.ebuild |
36 |
@@ -59,12 +59,12 @@ src_prepare() { |
37 |
-i lustre/conf/Makefile.am || die |
38 |
|
39 |
# replace upstream autogen.sh by our src_prepare() |
40 |
- local DIRS="build libcfs lnet lustre snmp" |
41 |
+ local DIRS="libcfs lnet lustre snmp" |
42 |
local ACLOCAL_FLAGS |
43 |
for dir in $DIRS ; do |
44 |
- ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/config" |
45 |
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/autoconf" |
46 |
done |
47 |
- eaclocal $ACLOCAL_FLAGS |
48 |
+ eaclocal -I config $ACLOCAL_FLAGS |
49 |
eautoheader |
50 |
eautomake |
51 |
eautoconf |
52 |
@@ -83,7 +83,7 @@ src_prepare() { |
53 |
cd .. |
54 |
einfo "Reconfiguring source in ldiskfs" |
55 |
cd ldiskfs |
56 |
- eaclocal |
57 |
+ eaclocal -I config |
58 |
eautoheader |
59 |
eautomake -W no-portability |
60 |
eautoconf |