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 ED2D7138334 for ; Sat, 13 Apr 2019 04:07:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B86ABE07D3; Sat, 13 Apr 2019 04:07:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8CE23E07D3 for ; Sat, 13 Apr 2019 04:07:39 +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 12E8E340CC5 for ; Sat, 13 Apr 2019 04:07:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34E7F57F for ; Sat, 13 Apr 2019 04:07:36 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1555128450.7534f110f6c60e2d24d0257a508d18a0fa606c3a.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/jq/jq-1.6-r3.ebuild X-VCS-Directories: app-misc/jq/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 7534f110f6c60e2d24d0257a508d18a0fa606c3a X-VCS-Branch: master Date: Sat, 13 Apr 2019 04:07:36 +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: ddf10264-69bc-479f-8a53-8e31ec861966 X-Archives-Hash: 0fd6833b08b698eac0e231bb115fe14f commit: 7534f110f6c60e2d24d0257a508d18a0fa606c3a Author: Robin H. Johnson gentoo org> AuthorDate: Sat Apr 13 04:02:53 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Apr 13 04:07:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7534f110 app-misc/jq: cpu savings & anti-bundling safety eautoreconf runs on all subdirectories that have autotooled and referenced by the toplevel Makefile.am SUBDIRS, even when we don't use a given subdirectory anymore. Rip out the subdirectory and Makefile.am reference. As a bonus, by removing the bundled source that's now unused, we prevent any accidental build usage of it. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Robin H. Johnson gentoo.org> app-misc/jq/jq-1.6-r3.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-misc/jq/jq-1.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild index 2b187f05c7a..036113cf531 100644 --- a/app-misc/jq/jq-1.6-r3.ebuild +++ b/app-misc/jq/jq-1.6-r3.ebuild @@ -36,6 +36,12 @@ src_prepare() { sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \ configure.ac || die + # jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma, + # but the bundled copy of oniguruma still gets eautoreconf'd since it + # exists; save the cycles by nuking it. + sed -i -e '/modules\/oniguruma/d' Makefile.am || die + rm -rf "${S}"/modules/oniguruma || die + default eautoreconf }