Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
Date: Wed, 10 Apr 2019 20:35:01
Message-Id: 1554928491.49ab5a2f1d063d1d5fae74355a385a471b253e4f.polynomial-c@gentoo
1 commit: 49ab5a2f1d063d1d5fae74355a385a471b253e4f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 10 20:31:53 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 10 20:34:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ab5a2f
7
8 sys-apps/util-linux: Move patch to PATCHES=() (and get rid of epatch)
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/util-linux/util-linux-2.33.1.ebuild | 16 +++++++++-------
14 1 file changed, 9 insertions(+), 7 deletions(-)
15
16 diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild
17 index 503832c70fa..aae182dbf8f 100644
18 --- a/sys-apps/util-linux/util-linux-2.33.1.ebuild
19 +++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild
20 @@ -63,6 +63,15 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
21
22 S="${WORKDIR}/${MY_P}"
23
24 +PATCHES=(
25 + # In glibc-2.29+, a lot of changes were made to arch-specific
26 + # handling of `struct termios', which breaks atleast MIPS.
27 + # The below patch from upstream fixes this, and should be
28 + # in the next release.
29 + # See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
30 + "${FILESDIR}/${P}-fix-struct_termios-check.patch"
31 +)
32 +
33 src_prepare() {
34 default
35
36 @@ -90,13 +99,6 @@ src_prepare() {
37 configure || die
38
39 elibtoolize
40 -
41 - # In glibc-2.29+, a lot of changes were made to arch-specific
42 - # handling of `struct termios', which breaks atleast MIPS.
43 - # The below patch from upstream fixes this, and should be
44 - # in the next release.
45 - # See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
46 - epatch "${FILESDIR}/${P}-fix-struct_termios-check.patch"
47 }
48
49 lfs_fallocate_test() {