Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
Date: Sun, 11 Feb 2018 11:23:42
Message-Id: 1518348169.0b0800435bbc35d2a175fff316535bf3225379f6.ulm@gentoo
1 commit: 0b0800435bbc35d2a175fff316535bf3225379f6
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 11 11:20:27 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 11 11:22:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b080043
7
8 app-editors/emacs: Disable the sandbox entirely.
9
10 In addition to SANDBOX_ON=0, unset LD_PRELOAD.
11 Fixes a build error on sparc.
12
13 Closes: https://bugs.gentoo.org/647238
14 Package-Manager: Portage-2.3.24, Repoman-2.3.6
15
16 app-editors/emacs/emacs-18.59-r11.ebuild | 5 ++---
17 app-editors/emacs/emacs-23.4-r16.ebuild | 5 +++--
18 app-editors/emacs/emacs-24.5-r4.ebuild | 4 ++--
19 app-editors/emacs/emacs-25.3.ebuild | 4 ++--
20 4 files changed, 9 insertions(+), 9 deletions(-)
21
22 diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
23 index 8b9d3d2c04e..19abd28b5a2 100644
24 --- a/app-editors/emacs/emacs-18.59-r11.ebuild
25 +++ b/app-editors/emacs/emacs-18.59-r11.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2017 Gentoo Foundation
28 +# Copyright 1999-2018 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=6
32 @@ -71,8 +71,7 @@ src_configure() {
33
34 src_compile() {
35 # Do not use the sandbox, or the dumped Emacs will be twice as large
36 - export SANDBOX_ON=0
37 - emake --jobs=1 \
38 + SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
39 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
40 LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
41 }
42
43 diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
44 index eb7cceabd89..00d4f14a53a 100644
45 --- a/app-editors/emacs/emacs-23.4-r16.ebuild
46 +++ b/app-editors/emacs/emacs-23.4-r16.ebuild
47 @@ -209,8 +209,9 @@ src_configure() {
48 }
49
50 src_compile() {
51 - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
52 - emake CC="$(tc-getCC)" \
53 + # Disable the sandbox. For the unbelievers, see bug #131505
54 + SANDBOX_ON=0 LD_PRELOAD="" emake \
55 + CC="$(tc-getCC)" \
56 AR="$(tc-getAR) cq" \
57 RANLIB="$(tc-getRANLIB)"
58 }
59
60 diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
61 index c86549765c9..8360af8c48d 100644
62 --- a/app-editors/emacs/emacs-24.5-r4.ebuild
63 +++ b/app-editors/emacs/emacs-24.5-r4.ebuild
64 @@ -210,8 +210,8 @@ src_configure() {
65 }
66
67 src_compile() {
68 - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
69 - emake
70 + # Disable the sandbox. For the unbelievers, see bug #131505
71 + SANDBOX_ON=0 LD_PRELOAD="" emake
72 }
73
74 src_install () {
75
76 diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
77 index 35c1cc20476..286763c2e23 100644
78 --- a/app-editors/emacs/emacs-25.3.ebuild
79 +++ b/app-editors/emacs/emacs-25.3.ebuild
80 @@ -220,8 +220,8 @@ src_configure() {
81 }
82
83 src_compile() {
84 - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
85 - emake
86 + # Disable the sandbox. For the unbelievers, see bug #131505
87 + SANDBOX_ON=0 LD_PRELOAD="" emake
88 }
89
90 src_install () {