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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AA4E158008 for ; Thu, 15 Jun 2023 15:55:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04A21E0A7D; Thu, 15 Jun 2023 15:53:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAA09E0A70 for ; Thu, 15 Jun 2023 15:53:02 +0000 (UTC) From: Sam James To: gentoo-dev@lists.gentoo.org Cc: ruby@gentoo.org, Sam James Subject: [gentoo-dev] [PATCH 10/11] ruby-ng.eclass: use shopt directly, not via estack.eclass Date: Thu, 15 Jun 2023 16:52:37 +0100 Message-ID: <20230615155240.589982-10-sam@gentoo.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615155240.589982-1-sam@gentoo.org> References: <20230615155240.589982-1-sam@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: d4409063-403c-4e27-b37f-d834b77f3bb8 X-Archives-Hash: ac2352c8f2e016d8c85044e2de7baf96 ulm points out that estack.eclass is particularly inefficient (although it'll get slightly better once https://github.com/gentoo/gentoo/pull/31437 is fixed). Let's just manually roll it like llvm.eclass does. Bug: https://bugs.gentoo.org/908465 Signed-off-by: Sam James --- eclass/ruby-ng.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index 14f4414337d6f..8fe26057e7ffe 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -163,7 +163,8 @@ _RUBY_ATOMS_SAMELIB_RESULT="" _ruby_atoms_samelib() { _RUBY_ATOMS_SAMELIB_RESULT="" - eshopts_push -o noglob + local shopt_save=$(shopt -p -o noglob) + set -f local token local atoms=" RUBYTARGET? (" for token in $*; do @@ -177,7 +178,7 @@ _ruby_atoms_samelib() { esac done atoms+=" ) " - eshopts_pop + ${shopt_save} _ruby_set_globals_invalidate_if_stale local _ruby_implementation -- 2.41.0