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 0E1641382C5 for ; Sat, 20 Jan 2018 16:57:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75B32E0863; Sat, 20 Jan 2018 16:57:51 +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 5241FE0863 for ; Sat, 20 Jan 2018 16:57:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 03225335C3A for ; Sat, 20 Jan 2018 16:57:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F925186 for ; Sat, 20 Jan 2018 16:57:48 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1516467449.ffbc9b4d0f08a5e46e071542e2034a0961efd94c.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: ffbc9b4d0f08a5e46e071542e2034a0961efd94c X-VCS-Branch: master Date: Sat, 20 Jan 2018 16:57:48 +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-Archives-Salt: 96681583-1ab4-4cbc-a502-84b5a3bc34e1 X-Archives-Hash: b5cb5480a69abb7d0d68642eb59ee35f commit: ffbc9b4d0f08a5e46e071542e2034a0961efd94c Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Jan 20 16:56:58 2018 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Jan 20 16:57:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbc9b4d sys-libs/glibc: On second thought, let's not use linux-info.eclass here. It introduces too much magic and makes too many assumptions. Still, we now do not use any deprecated portage features anymore. Bug: https://bugs.gentoo.org/587320 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-libs/glibc/glibc-9999.ebuild | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index f2132994237..a215358c1b2 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \ - multilib systemd multiprocessing linux-info + multilib systemd multiprocessing DESCRIPTION="GNU libc C library" HOMEPAGE="https://www.gnu.org/software/libc/" @@ -509,8 +509,15 @@ check_devpts() { fi } -# The following functions are copied from portage source and split a Kernel -# version into its components. +# The following Kernel version handling functions are mostly copied from portage +# source. It's better not to use linux-info.eclass here since a) it adds too +# much magic, see bug 326693 for some of the arguments, and b) some of the +# functions are just not provided. + +g_get_running_KV() { + uname -r + return $? +} g_KV_major() { [[ -z $1 ]] && return 1 @@ -573,10 +580,7 @@ check_nptl_support() { local run_kv build_kv want_kv - # We get the running kernel version using linux-info.eclass - get_running_version - run_kv=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} - + run_kv=$(g_get_running_KV) build_kv=$(g_int_to_KV $(get_kheader_version)) want_kv=${MIN_KERN_VER}