| 1 |
commit: ae98975cbc8d7c75ac789ca508ba6441341f674f |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 18 08:22:03 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 18 08:22:03 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae98975c |
| 7 |
|
| 8 |
sys-fs/lvm2: Bumped ebuild to EAPI-7 |
| 9 |
|
| 10 |
Be more verbose during make calls |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.67, Repoman-2.3.14 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-fs/lvm2/lvm2-2.02.185.ebuild | 25 ++++++++++++++----------- |
| 16 |
1 file changed, 14 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild |
| 19 |
index f82f1a6846b..49ad4a19d86 100644 |
| 20 |
--- a/sys-fs/lvm2/lvm2-2.02.185.ebuild |
| 21 |
+++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
# Copyright 1999-2019 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=6 |
| 27 |
+EAPI=7 |
| 28 |
inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic |
| 29 |
|
| 30 |
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
| 31 |
@@ -38,16 +38,19 @@ RDEPEND="${DEPEND_COMMON} |
| 32 |
# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
| 33 |
# USE 'static' currently only works with eudev, bug 520450 |
| 34 |
DEPEND="${DEPEND_COMMON} |
| 35 |
- virtual/pkgconfig |
| 36 |
>=sys-devel/binutils-2.20.1-r1 |
| 37 |
- sys-devel/autoconf-archive |
| 38 |
static? ( |
| 39 |
selinux? ( sys-libs/libselinux[static-libs] ) |
| 40 |
udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
| 41 |
>=sys-apps/util-linux-2.16[static-libs] |
| 42 |
)" |
| 43 |
+BDEPEND=" |
| 44 |
+ sys-devel/autoconf-archive |
| 45 |
+ virtual/pkgconfig |
| 46 |
+" |
| 47 |
+ |
| 48 |
|
| 49 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
| 50 |
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}" |
| 51 |
|
| 52 |
PATCHES=( |
| 53 |
# Gentoo specific modification(s): |
| 54 |
@@ -76,7 +79,7 @@ pkg_setup() { |
| 55 |
local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
| 56 |
if linux_config_exists; then |
| 57 |
local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
| 58 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
| 59 |
+ if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then |
| 60 |
ewarn "It's recommended to set an empty value to the following kernel config option:" |
| 61 |
ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
| 62 |
fi |
| 63 |
@@ -190,14 +193,14 @@ src_configure() { |
| 64 |
|
| 65 |
src_compile() { |
| 66 |
pushd include >/dev/null |
| 67 |
- emake |
| 68 |
+ emake V=1 |
| 69 |
popd >/dev/null |
| 70 |
|
| 71 |
if use device-mapper-only ; then |
| 72 |
- emake device-mapper |
| 73 |
+ emake V=1 device-mapper |
| 74 |
else |
| 75 |
- emake |
| 76 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
| 77 |
+ emake V=1 |
| 78 |
+ emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
| 79 |
fi |
| 80 |
} |
| 81 |
|
| 82 |
@@ -208,7 +211,7 @@ src_install() { |
| 83 |
use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
| 84 |
use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
| 85 |
for inst in ${INSTALL_TARGETS[@]}; do |
| 86 |
- emake DESTDIR="${D}" ${inst} |
| 87 |
+ emake V=1 DESTDIR="${D}" ${inst} |
| 88 |
done |
| 89 |
|
| 90 |
newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
| 91 |
@@ -241,7 +244,7 @@ src_install() { |
| 92 |
dolib.a daemons/dmeventd/libdevmapper-event.a |
| 93 |
#gen_usr_ldscript libdevmapper-event.so |
| 94 |
else |
| 95 |
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
| 96 |
+ rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
| 97 |
fi |
| 98 |
|
| 99 |
if use lvm2create_initrd; then |
Archives