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 3CE4E13933E for ; Sun, 11 Jul 2021 18:45:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40E72E0D2B; Sun, 11 Jul 2021 18:45:41 +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 2668FE0D2B for ; Sun, 11 Jul 2021 18:45:41 +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 04BA833FEB6 for ; Sun, 11 Jul 2021 18:45:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89BAE7BA for ; Sun, 11 Jul 2021 18:45:38 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1626029132.5bd9495d157f02609a2942992e42cf08121ea15a.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-28.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 5bd9495d157f02609a2942992e42cf08121ea15a X-VCS-Branch: master Date: Sun, 11 Jul 2021 18:45:38 +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: a5dd9616-d2e1-4d99-b7da-a9ba63104d50 X-Archives-Hash: 17323bc54bf27fd5d4c21d97f2f28e31 commit: 5bd9495d157f02609a2942992e42cf08121ea15a Author: Ulrich Müller gentoo org> AuthorDate: Sun Jul 11 18:45:12 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Jul 11 18:45:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd9495d app-editors/emacs: Work around jit not working with ccache Bug: https://bugs.gentoo.org/801580 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-28.0.9999.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index aeefea10ed8..4a6795ce801 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -141,9 +141,16 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi - # These files ignore LDFLAGS. We assign the variable here, because - # for live ebuilds FULL_VERSION doesn't exist in global scope - use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + if use jit; then + # These files ignore LDFLAGS. We assign the variable here, because + # for live ebuilds FULL_VERSION doesn't exist in global scope + QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + # gccjit doesn't play well with ccache #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi default