From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A845138334 for ; Wed, 10 Apr 2019 20:35:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7403E0896; Wed, 10 Apr 2019 20:34:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4E33E0896 for ; Wed, 10 Apr 2019 20:34:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C131340C80 for ; Wed, 10 Apr 2019 20:34:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECE96594 for ; Wed, 10 Apr 2019 20:34:56 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1554928491.49ab5a2f1d063d1d5fae74355a385a471b253e4f.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-2.33.1.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 49ab5a2f1d063d1d5fae74355a385a471b253e4f X-VCS-Branch: master Date: Wed, 10 Apr 2019 20:34:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9a0562c-edd1-4bc7-b245-60d313909194 X-Archives-Hash: 00bd864081f9ba1e7351eaa32fb0ca03 commit: 49ab5a2f1d063d1d5fae74355a385a471b253e4f Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 10 20:31:53 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 10 20:34:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ab5a2f 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 gentoo.org> 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 503832c70fa..aae182dbf8f 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() {