app-editors/emacs: Disable the sandbox entirely.

In addition to SANDBOX_ON=0, unset LD_PRELOAD.
Fixes a build error on sparc.

Closes: https://bugs.gentoo.org/647238
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index 8b9d3d2c04e9d3d69247baee35a1c9d8e8c5fded..19abd28b5a2062afa6bb3e46ef319ec5f8ec8f36 100644 (file)
--- 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
@@ -71,8 +71,7 @@ src_configure() {
 
 src_compile() {
        # Do not use the sandbox, or the dumped Emacs will be twice as large
-       export SANDBOX_ON=0
-       emake --jobs=1 \
+       SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
                CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
                LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
 }

diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
index eb7cceabd897ba101c3541e5d42f2675d32997ad..00d4f14a53a563eeb837839691d3fb715b72b6f5 100644 (file)
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.ebuild
@@ -209,8 +209,9 @@ src_configure() {
 }
 
 src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       emake CC="$(tc-getCC)" \
+       # Disable the sandbox. For the unbelievers, see bug #131505
+       SANDBOX_ON=0 LD_PRELOAD="" emake \
+               CC="$(tc-getCC)" \
                AR="$(tc-getAR) cq" \
                RANLIB="$(tc-getRANLIB)"
 }

diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
index c86549765c99e3e6d7a8e9cbf22b9f16773f2772..8360af8c48d8e5d16a93cd37219a1785580dc610 100644 (file)
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.ebuild
@@ -210,8 +210,8 @@ src_configure() {
 }
 
 src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       emake
+       # Disable the sandbox. For the unbelievers, see bug #131505
+       SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {

diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index 35c1cc20476ff84511798dc0bf666384627d7df4..286763c2e2366ddb277e1b774290cd35f7f00a3e 100644 (file)
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -220,8 +220,8 @@ src_configure() {
 }
 
 src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
-       emake
+       # Disable the sandbox. For the unbelievers, see bug #131505
+       SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {