From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1ADA41396D0 for ; Sun, 3 Sep 2017 06:28:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D19AE0E77; Sun, 3 Sep 2017 06:28:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47929E0E77 for ; Sun, 3 Sep 2017 06:28:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56E9634071C for ; Sun, 3 Sep 2017 06:28:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FB0A8C3B for ; Sun, 3 Sep 2017 06:28:25 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504420096.b5719a7a45673faada9502bba39c5e9af9e16a30.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: b5719a7a45673faada9502bba39c5e9af9e16a30 X-VCS-Branch: master Date: Sun, 3 Sep 2017 06:28:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1e1140fe-a62b-41d9-ba5c-6f5edb472a54 X-Archives-Hash: d2a50e9e758013ffdf9dd5afdde9d48a commit: b5719a7a45673faada9502bba39c5e9af9e16a30 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Sep 3 06:26:38 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Sep 3 06:28:16 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b5719a7a gen_compile: allow lvm-2.02.173 to compile Signed-off-by: Robin H. Johnson gentoo.org> gen_compile.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index 76e11a8..19ea1ce 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -502,15 +502,20 @@ compile_lvm() { [ -d "${LVM_DIR}" ] || gen_die "LVM directory ${LVM_DIR} is invalid!" cd "${LVM_DIR}" + print_info 1 'lvm: >> Patching ...' apply_patches lvm ${LVM_VER} + # we currently have a patch that changes configure.ac + # once given patch is dropped, drop autoconf too + print_info 1 'lvm: >> Autoconf ...' + autoconf || gen_die 'Autoconf failed for LVM2' print_info 1 'lvm: >> Configuring...' LVM_CONF=( --enable-static_link --prefix=/ - --enable-dmeventd + --disable-dmeventd # Fails to build libdm-string.c:(.text+0x1481): undefined reference to `nearbyintl' --enable-cmdlib - --enable-lib - --enable-lvmetad + --enable-applib + --disable-lvmetad --with-lvm1=internal --with-clvmd=none --with-cluster=none @@ -524,12 +529,16 @@ compile_lvm() { --with-raid=internal ) CFLAGS="-fPIC" \ + LIBS='-luuid -lrt -lpthread -lm' \ + LDFLAGS='-Wl,--no-as-needed' \ ./configure "${LVM_CONF[@]}" \ >> ${LOGFILE} 2>&1 || \ gen_die 'Configure of lvm failed!' print_info 1 'lvm: >> Compiling...' compile_generic '' utils || gen_die "failed to build LVM" + mkdir -p "${TEMP}/lvm/sbin" + print_info 1 'lvm: >> Installing to DESTDIR...' compile_generic "install DESTDIR=${TEMP}/lvm/" utils || gen_die "failed to install LVM" # Upstream does u-w on files, and this breaks stuff. chmod -R u+w "${TEMP}/lvm/"