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 4E94C1382C5 for ; Sun, 11 Mar 2018 12:07:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32E06E081B; Sun, 11 Mar 2018 12:07:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 00BD1E081B for ; Sun, 11 Mar 2018 12:07:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5ECA5335C71 for ; Sun, 11 Mar 2018 12:07:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9982232 for ; Sun, 11 Mar 2018 12:07:17 +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: <1520769757.f40ffc42c1381cd29aa3b75b5d0c3c1372b175c5.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-18.59-r11.ebuild app-editors/emacs/emacs-23.4-r17.ebuild app-editors/emacs/emacs-24.5-r5.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: f40ffc42c1381cd29aa3b75b5d0c3c1372b175c5 X-VCS-Branch: master Date: Sun, 11 Mar 2018 12:07:17 +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-Archives-Salt: 49b6787c-d01f-4ac8-8fdd-0b2545a62232 X-Archives-Hash: 1315acec72510fad323ba28e7901e51e commit: f40ffc42c1381cd29aa3b75b5d0c3c1372b175c5 Author: Ulrich Müller gentoo org> AuthorDate: Thu Feb 22 13:21:05 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Mar 11 12:02:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40ffc42 app-editors/emacs: Disable the sandbox only when dumping. Apply this also to slots 18, 23, and 24. Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-editors/emacs/emacs-18.59-r11.ebuild | 13 ++++++++++--- app-editors/emacs/emacs-23.4-r17.ebuild | 5 +++-- app-editors/emacs/emacs-24.5-r5.ebuild | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild index 8b9d3d2c04e..9b260064e0b 100644 --- a/app-editors/emacs/emacs-18.59-r11.ebuild +++ b/app-editors/emacs/emacs-18.59-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,6 +28,14 @@ DEPEND="${RDEPEND} PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch" +src_prepare() { + default + + # Do not use the sandbox, or the dumped Emacs will be twice as large + sed -i -e 's:\./temacs.*dump:env SANDBOX_ON=0 LD_PRELOAD= &:' \ + src/ymakefile || die +} + src_configure() { # autoconf? What's autoconf? We are living in 1992. ;-) local arch @@ -70,8 +78,7 @@ src_configure() { } src_compile() { - # Do not use the sandbox, or the dumped Emacs will be twice as large - export SANDBOX_ON=0 + addpredict /var/lib/emacs/lock emake --jobs=1 \ CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \ LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}" diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild index 92884cb78c1..b331aae1a49 100644 --- a/app-editors/emacs/emacs-23.4-r17.ebuild +++ b/app-editors/emacs/emacs-23.4-r17.ebuild @@ -223,10 +223,11 @@ src_configure() { } src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + # Disable sandbox when dumping. For the unbelievers, see bug #131505 emake CC="$(tc-getCC)" \ AR="$(tc-getAR) cq" \ - RANLIB="$(tc-getRANLIB)" + RANLIB="$(tc-getRANLIB)" \ + RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs" } src_install () { diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild index cc5f76a02d4..2668c7388bd 100644 --- a/app-editors/emacs/emacs-24.5-r5.ebuild +++ b/app-editors/emacs/emacs-24.5-r5.ebuild @@ -224,8 +224,8 @@ src_configure() { } src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake + # Disable sandbox when dumping. For the unbelievers, see bug #131505 + emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs" } src_install () {