| 1 |
commit: 1233c2bc3f53793b6b5354730c69923c6329cfef |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 11 16:30:46 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 11 16:35:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1233c2bc |
| 7 |
|
| 8 |
app-editors/emacs: Revert "Disable the sandbox entirely." |
| 9 |
|
| 10 |
Reverts: 0b0800435bbc35d2a175fff316535bf3225379f6 |
| 11 |
|
| 12 |
app-editors/emacs/emacs-18.59-r11.ebuild | 5 +++-- |
| 13 |
app-editors/emacs/emacs-23.4-r17.ebuild | 5 ++--- |
| 14 |
app-editors/emacs/emacs-24.5-r5.ebuild | 4 ++-- |
| 15 |
app-editors/emacs/emacs-25.3-r1.ebuild | 4 ++-- |
| 16 |
4 files changed, 9 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild |
| 19 |
index 19abd28b5a2..8b9d3d2c04e 100644 |
| 20 |
--- a/app-editors/emacs/emacs-18.59-r11.ebuild |
| 21 |
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -71,7 +71,8 @@ src_configure() { |
| 29 |
|
| 30 |
src_compile() { |
| 31 |
# Do not use the sandbox, or the dumped Emacs will be twice as large |
| 32 |
- SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \ |
| 33 |
+ export SANDBOX_ON=0 |
| 34 |
+ emake --jobs=1 \ |
| 35 |
CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \ |
| 36 |
LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}" |
| 37 |
} |
| 38 |
|
| 39 |
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild |
| 40 |
index 73d6f0dcad3..09fda80f8ed 100644 |
| 41 |
--- a/app-editors/emacs/emacs-23.4-r17.ebuild |
| 42 |
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild |
| 43 |
@@ -224,9 +224,8 @@ src_configure() { |
| 44 |
} |
| 45 |
|
| 46 |
src_compile() { |
| 47 |
- # Disable the sandbox. For the unbelievers, see bug #131505 |
| 48 |
- SANDBOX_ON=0 LD_PRELOAD="" emake \ |
| 49 |
- CC="$(tc-getCC)" \ |
| 50 |
+ export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
| 51 |
+ emake CC="$(tc-getCC)" \ |
| 52 |
AR="$(tc-getAR) cq" \ |
| 53 |
RANLIB="$(tc-getRANLIB)" |
| 54 |
} |
| 55 |
|
| 56 |
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild |
| 57 |
index 1b9958b58c0..a60d2935347 100644 |
| 58 |
--- a/app-editors/emacs/emacs-24.5-r5.ebuild |
| 59 |
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild |
| 60 |
@@ -225,8 +225,8 @@ src_configure() { |
| 61 |
} |
| 62 |
|
| 63 |
src_compile() { |
| 64 |
- # Disable the sandbox. For the unbelievers, see bug #131505 |
| 65 |
- SANDBOX_ON=0 LD_PRELOAD="" emake |
| 66 |
+ export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
| 67 |
+ emake |
| 68 |
} |
| 69 |
|
| 70 |
src_install () { |
| 71 |
|
| 72 |
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild |
| 73 |
index c88e891f9ae..0377eb67861 100644 |
| 74 |
--- a/app-editors/emacs/emacs-25.3-r1.ebuild |
| 75 |
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild |
| 76 |
@@ -237,8 +237,8 @@ src_configure() { |
| 77 |
} |
| 78 |
|
| 79 |
src_compile() { |
| 80 |
- # Disable the sandbox. For the unbelievers, see bug #131505 |
| 81 |
- SANDBOX_ON=0 LD_PRELOAD="" emake |
| 82 |
+ export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
| 83 |
+ emake |
| 84 |
} |
| 85 |
|
| 86 |
src_install () { |
Archives