summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-07-20 10:42:56 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-07-20 10:42:56 +0000
commitded656e02a2efb172451d78e34586d65a35a1fdc (patch)
treee7981c26af1f94aea1bf2b9fa29205c4a8198430 /sys-libs
parentMasked latest e2fsprogs as it fails to build (diff)
downloadgentoo-2-ded656e02a2efb172451d78e34586d65a35a1fdc.tar.gz
gentoo-2-ded656e02a2efb172451d78e34586d65a35a1fdc.tar.bz2
gentoo-2-ded656e02a2efb172451d78e34586d65a35a1fdc.zip
Version bump. Removed old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/e2fsprogs-libs/ChangeLog8
-rw-r--r--sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild (renamed from sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild)15
2 files changed, 19 insertions, 4 deletions
diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 4a5f8920d8a3..2a6e85e80a7c 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-libs/e2fsprogs-libs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.120 2014/07/18 02:07:55 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.121 2014/07/20 10:42:56 polynomial-c Exp $
+
+*e2fsprogs-libs-1.42.11 (20 Jul 2014)
+
+ 20 Jul 2014; Lars Wendler <polynomial-c@gentoo.org>
+ -e2fsprogs-libs-1.42.9.ebuild, +e2fsprogs-libs-1.42.11.ebuild:
+ Version bump. Removed old.
18 Jul 2014; Matt Turner <mattst88@gentoo.org> e2fsprogs-libs-1.42.10.ebuild:
alpha stable, bug 516114.
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
index d572186a4ef0..ba77a94ea881 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.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-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild,v 1.3 2014/01/18 02:37:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.1 2014/07/20 10:42:56 polynomial-c Exp $
EAPI="4"
@@ -9,7 +9,7 @@ case ${PV} in
*) UP_PV=${PV} ;;
esac
-inherit toolchain-funcs eutils multilib-minimal
+inherit autotools toolchain-funcs eutils multilib-minimal
DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -35,6 +35,8 @@ S=${WORKDIR}/${P%_pre*}
src_prepare() {
printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
+ epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
+ eautoreconf
}
multilib_src_configure() {
@@ -43,6 +45,9 @@ multilib_src_configure() {
ac_cv_lib_blkid_blkid_get_cache=yes \
ac_cv_path_LDCONFIG=: \
ECONF_SOURCE="${S}" \
+ CC="$(tc-getCC)" \
+ BUILD_CC="$(tc-getBUILD_CC)" \
+ BUILD_LD="$(tc-getBUILD_LD)" \
econf \
--disable-lib{blkid,uuid} \
--disable-quota \
@@ -51,8 +56,12 @@ multilib_src_configure() {
$(use_enable nls)
}
+multilib_src_compile() {
+ emake V=1
+}
+
multilib_src_install() {
- emake STRIP=: DESTDIR="${D}" install || die
+ emake V=1 STRIP=: DESTDIR="${D}" install || die
multilib_is_native_abi && gen_usr_ldscript -a com_err ss
# configure doesn't have an option to disable static libs :/
use static-libs || find "${ED}" -name '*.a' -delete