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 EB6DB1382C5 for ; Sun, 10 Jan 2021 14:55:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F26FE0B19; Sun, 10 Jan 2021 14:55:01 +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 E9ADAE0B19 for ; Sun, 10 Jan 2021 14:55:00 +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 506BE34103A for ; Sun, 10 Jan 2021 14:54:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5A8B3A6 for ; Sun, 10 Jan 2021 14:54:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1610290495.d597caec57cbe19328cbd2d3a026f40c4e8b75df.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/toybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/toybox/toybox-0.8.4.ebuild sys-apps/toybox/toybox-9999.ebuild X-VCS-Directories: sys-apps/toybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d597caec57cbe19328cbd2d3a026f40c4e8b75df X-VCS-Branch: master Date: Sun, 10 Jan 2021 14:54:57 +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: 1cc3808e-bdcc-4de5-8dd4-139cbbe34bcb X-Archives-Hash: 8f40ce4c79a3a95431acf0cf00f3f70c commit: d597caec57cbe19328cbd2d3a026f40c4e8b75df Author: Sam James gentoo org> AuthorDate: Sun Jan 10 14:54:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 10 14:54:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d597caec sys-apps/toybox: sync live Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sys-apps/toybox/toybox-0.8.4.ebuild | 4 +--- sys-apps/toybox/toybox-9999.ebuild | 13 ++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/sys-apps/toybox/toybox-0.8.4.ebuild b/sys-apps/toybox/toybox-0.8.4.ebuild index 6abff1d6eb8..5b1788940a1 100644 --- a/sys-apps/toybox/toybox-0.8.4.ebuild +++ b/sys-apps/toybox/toybox-0.8.4.ebuild @@ -20,9 +20,6 @@ HOMEPAGE="https://landley.net/code/toybox/" LICENSE="BSD-2" SLOT="0" -# makefile is stupid -#RESTRICT="test" - src_prepare() { default restore_config .config @@ -31,6 +28,7 @@ src_prepare() { src_configure() { tc-export CC STRIP export HOSTCC="$(tc-getBUILD_CC)" + # Respect CFLAGS export OPTIMIZE="${CFLAGS}" if [[ -f .config ]]; then diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild index 68a184db8eb..5b1788940a1 100644 --- a/sys-apps/toybox/toybox-9999.ebuild +++ b/sys-apps/toybox/toybox-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit multiprocessing savedconfig toolchain-funcs @@ -13,16 +13,12 @@ else KEYWORDS="~amd64 ~x86" fi -# makefile is stupid -RESTRICT="test" - DESCRIPTION="Common linux commands in a multicall binary" HOMEPAGE="https://landley.net/code/toybox/" # The source code does not explicitly say that it's BSD, but the author has repeatedly said it LICENSE="BSD-2" SLOT="0" -IUSE="" src_prepare() { default @@ -32,7 +28,10 @@ src_prepare() { src_configure() { tc-export CC STRIP export HOSTCC="$(tc-getBUILD_CC)" - if [ -f .config ]; then + # Respect CFLAGS + export OPTIMIZE="${CFLAGS}" + + if [[ -f .config ]]; then yes "" | emake -j1 oldconfig > /dev/null return 0 else