From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1429012-garchives=archives.gentoo.org@lists.gentoo.org>
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 5593D158094
for <garchives@archives.gentoo.org>; Fri, 19 Aug 2022 17:58:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 80150E0864;
Fri, 19 Aug 2022 17:58:07 +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 5A1A1E0864
for <gentoo-commits@lists.gentoo.org>; Fri, 19 Aug 2022 17:58:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 smtp.gentoo.org (Postfix) with ESMTPS id 2F3BE3410CB
for <gentoo-commits@lists.gentoo.org>; Fri, 19 Aug 2022 17:58:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 908E3500
for <gentoo-commits@lists.gentoo.org>; Fri, 19 Aug 2022 17:58:04 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
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" <ulm@gentoo.org>
Message-ID: <1660931879.1e426bc7311ebc80bc5e3e556a23d81b41705fa4.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.1-r3.ebuild app-editors/emacs/emacs-28.1.91-r1.ebuild app-editors/emacs/emacs-28.1.91.ebuild app-editors/emacs/emacs-28.1.9999.ebuild app-editors/emacs/emacs-29.0.9999.ebuild
X-VCS-Directories: app-editors/emacs/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 1e426bc7311ebc80bc5e3e556a23d81b41705fa4
X-VCS-Branch: master
Date: Fri, 19 Aug 2022 17:58:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f32523e1-2d43-4db5-a7ba-e0c7254783ff
X-Archives-Hash: 0f70f272d5dced0232d9a18470a02f71
commit: 1e426bc7311ebc80bc5e3e556a23d81b41705fa4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 17:55:30 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 17:57:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e426bc7
app-editors/emacs: Enable NATIVE_FULL_AOT=1 with USE=jit
Unfortunately, upstream doesn't provide any configure option for this.
Work around it by setting the environment variable.
Bug: https://bugs.gentoo.org/808522
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/{emacs-28.1.91.ebuild => emacs-28.1-r3.ebuild} | 7 +++++--
.../emacs/{emacs-28.1.91.ebuild => emacs-28.1.91-r1.ebuild} | 3 +++
app-editors/emacs/emacs-28.1.9999.ebuild | 3 +++
app-editors/emacs/emacs-29.0.9999.ebuild | 3 +++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs/emacs-28.1.91.ebuild b/app-editors/emacs/emacs-28.1-r3.ebuild
similarity index 98%
copy from app-editors/emacs/emacs-28.1.91.ebuild
copy to app-editors/emacs/emacs-28.1-r3.ebuild
index 52d3b54aba86..20c5afe8a337 100644
--- a/app-editors/emacs/emacs-28.1.91.ebuild
+++ b/app-editors/emacs/emacs-28.1-r3.ebuild
@@ -32,7 +32,7 @@ else
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
fi
# Patchset from proj/emacs-patches.git
- SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${PN}-28.1-patches-1.tar.xz"
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
PATCHES=("${WORKDIR}/patch")
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
@@ -141,7 +141,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.ac)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EGIT_BRANCH}"
@@ -152,6 +152,9 @@ src_prepare() {
fi
if use jit; then
+ export NATIVE_FULL_AOT=1
+ find lisp -type f -name "*.elc" -delete || die
+
# 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/.*"
diff --git a/app-editors/emacs/emacs-28.1.91.ebuild b/app-editors/emacs/emacs-28.1.91-r1.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-28.1.91.ebuild
rename to app-editors/emacs/emacs-28.1.91-r1.ebuild
index 52d3b54aba86..f40d3160db81 100644
--- a/app-editors/emacs/emacs-28.1.91.ebuild
+++ b/app-editors/emacs/emacs-28.1.91-r1.ebuild
@@ -152,6 +152,9 @@ src_prepare() {
fi
if use jit; then
+ export NATIVE_FULL_AOT=1
+ find lisp -type f -name "*.elc" -delete || die
+
# 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/.*"
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index ce9357f531fc..9dde01902de3 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -149,6 +149,9 @@ src_prepare() {
fi
if use jit; then
+ export NATIVE_FULL_AOT=1
+ find lisp -type f -name "*.elc" -delete || die
+
# 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/.*"
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 0fde98bc4137..c533ab2a5a6e 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -171,6 +171,9 @@ src_prepare() {
fi
if use jit; then
+ export NATIVE_FULL_AOT=1
+ find lisp -type f -name "*.elc" -delete || die
+
# 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/.*"