summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-08-05 14:27:40 +0000
committerChristoph Junghans <ottxor@gentoo.org>2014-08-05 14:27:40 +0000
commit8bcbc8dd7420d9636fbda258a8bd0b30a836ca48 (patch)
tree050db4696a240717cf63e745b2360d7e55e0fd3a /sys-apps/util-linux
parentadded prefix support (bug #433736) (diff)
downloadgentoo-2-8bcbc8dd7420d9636fbda258a8bd0b30a836ca48.tar.gz
gentoo-2-8bcbc8dd7420d9636fbda258a8bd0b30a836ca48.tar.bz2
gentoo-2-8bcbc8dd7420d9636fbda258a8bd0b30a836ca48.zip
added prefix support (bug #518898)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/ChangeLog5
-rw-r--r--sys-apps/util-linux/util-linux-2.24.2.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 22e76ce30285..e3256c99eb2f 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.479 2014/08/01 10:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.480 2014/08/05 14:27:40 ottxor Exp $
+
+ 05 Aug 2014; Christoph Junghans <ottxor@gentoo.org> util-linux-2.24.2.ebuild:
+ added prefix support (bug #518898)
01 Aug 2014; Mike Frysinger <vapier@gentoo.org> util-linux-2.24.1-r3.ebuild:
Mark arm64/hppa/m68k/s390/sh stable.
diff --git a/sys-apps/util-linux/util-linux-2.24.2.ebuild b/sys-apps/util-linux/util-linux-2.24.2.ebuild
index 244359d4f106..436d08e36552 100644
--- a/sys-apps/util-linux/util-linux-2.24.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.24.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.2.ebuild,v 1.5 2014/07/31 20:56:53 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.2.ebuild,v 1.6 2014/08/05 14:27:40 ottxor Exp $
EAPI="4"
@@ -88,10 +88,14 @@ lfs_fallocate_test() {
multilib_src_configure() {
lfs_fallocate_test
export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+ # We manually set --libdir to the default since on prefix, econf will set it to
+ # a value which the configure script does not recognize. This makes it set the
+ # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
ECONF_SOURCE=${S} \
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
+ --libdir='${prefix}/'"$(get_libdir)" \
$(multilib_native_use_enable nls) \
--enable-agetty \
--with-bashcompletiondir="$(get_bashcompdir)" \