From 49ab5a2f1d063d1d5fae74355a385a471b253e4f Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 10 Apr 2019 22:31:53 +0200 Subject: [PATCH] sys-apps/util-linux: Move patch to PATCHES=() (and get rid of epatch) Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler --- sys-apps/util-linux/util-linux-2.33.1.ebuild | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild index 503832c70fa6..aae182dbf8fc 100644 --- a/sys-apps/util-linux/util-linux-2.33.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild @@ -63,6 +63,15 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" +PATCHES=( + # In glibc-2.29+, a lot of changes were made to arch-specific + # handling of `struct termios', which breaks atleast MIPS. + # The below patch from upstream fixes this, and should be + # in the next release. + # See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7 + "${FILESDIR}/${P}-fix-struct_termios-check.patch" +) + src_prepare() { default @@ -90,13 +99,6 @@ src_prepare() { configure || die elibtoolize - - # In glibc-2.29+, a lot of changes were made to arch-specific - # handling of `struct termios', which breaks atleast MIPS. - # The below patch from upstream fixes this, and should be - # in the next release. - # See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7 - epatch "${FILESDIR}/${P}-fix-struct_termios-check.patch" } lfs_fallocate_test() { -- 2.26.2