diff options
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.21.1.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.21.ebuild | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 69083aca8be8..164be42ebe9a 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/util-linux # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.374 2012/03/30 18:53:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.375 2012/03/30 20:04:16 vapier Exp $ + + 30 Mar 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.21.ebuild, + util-linux-2.21.1.ebuild: + Add cross-compiling fixes to match upstream. *util-linux-2.21.1 (30 Mar 2012) diff --git a/sys-apps/util-linux/util-linux-2.21.1.ebuild b/sys-apps/util-linux/util-linux-2.21.1.ebuild index 1ca4e407b69a..d584687927bc 100644 --- a/sys-apps/util-linux/util-linux-2.21.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.21.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.21.1.ebuild,v 1.1 2012/03/30 18:53:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.1.ebuild,v 1.2 2012/03/30 20:04:16 vapier Exp $ EAPI="3" @@ -68,6 +68,12 @@ lfs_fallocate_test() { src_configure() { lfs_fallocate_test + if tc-is-cross-compiler ; then + # newer util-linux has this fixed in the configure script already + [[ ${PV} != 2.21* ]] && die + export scanf_cv_alloc_modifier=no + [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms + fi econf \ --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ diff --git a/sys-apps/util-linux/util-linux-2.21.ebuild b/sys-apps/util-linux/util-linux-2.21.ebuild index ef5255468054..4c259ba8a813 100644 --- a/sys-apps/util-linux/util-linux-2.21.ebuild +++ b/sys-apps/util-linux/util-linux-2.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.21.ebuild,v 1.1 2012/02/24 16:35:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.2 2012/03/30 20:04:16 vapier Exp $ EAPI="3" @@ -68,6 +68,12 @@ lfs_fallocate_test() { src_configure() { lfs_fallocate_test + if tc-is-cross-compiler ; then + # newer util-linux has this fixed in the configure script already + [[ ${PV} != 2.21* ]] && die + export scanf_cv_alloc_modifier=no + [[ ${CHOST} == *-gnu* ]] && scanf_cv_alloc_modifier=ms + fi econf \ --enable-fs-paths-extra=/usr/sbin \ $(use_enable nls) \ |