Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Sun, 03 Sep 2017 05:04:02
Message-Id: 1504414418.a1052148144e0fd22cd702e41e9db217900c0fac.robbat2@gentoo
1 commit: a1052148144e0fd22cd702e41e9db217900c0fac
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 3 04:53:38 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 3 04:53:38 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1052148
7
8 gen_compile: make LVM configure options easier to patch.
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 gen_compile.sh | 26 ++++++++++++++++++--------
13 1 file changed, 18 insertions(+), 8 deletions(-)
14
15 diff --git a/gen_compile.sh b/gen_compile.sh
16 index 7df0154..30d5299 100755
17 --- a/gen_compile.sh
18 +++ b/gen_compile.sh
19 @@ -500,14 +500,24 @@ compile_lvm() {
20 cd "${LVM_DIR}"
21 apply_patches lvm ${LVM_VER}
22 print_info 1 'lvm: >> Configuring...'
23 - CFLAGS="-fPIC" \
24 - ./configure --enable-static_link --prefix=/ \
25 - --enable-dmeventd --enable-cmdlib \
26 - --with-lvm1=internal --with-clvmd=none --with-cluster=none \
27 - --disable-readline --disable-selinux --with-mirrors=internal \
28 - --with-snapshots=internal --with-pool=internal \
29 - >> ${LOGFILE} 2>&1 || \
30 - gen_die 'Configure of lvm failed!'
31 + LVM_CONF=(
32 + --enable-static_link
33 + --prefix=/
34 + --enable-dmeventd
35 + --enable-cmdlib
36 + --with-lvm1=internal
37 + --with-clvmd=none
38 + --with-cluster=none
39 + --disable-readline
40 + --disable-selinux
41 + --with-mirrors=internal
42 + --with-snapshots=internal
43 + --with-pool=internal
44 + )
45 + CFLAGS="-fPIC" \
46 + ./configure "${LVM_CONF[@]}" \
47 + >> ${LOGFILE} 2>&1 || \
48 + gen_die 'Configure of lvm failed!'
49 print_info 1 'lvm: >> Compiling...'
50 compile_generic '' utils || gen_die "failed to build LVM"
51 mkdir -p "${TEMP}/lvm/sbin"