[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

[William Hubbs]

commit:     47d38ea84daa3aaca57b9eef39ac98729a769c04
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 22:59:18 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 23:01:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d38ea8

net-libs/nodejs: add pax support to 15.2.1

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 net-libs/nodejs/nodejs-15.2.1.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/net-libs/nodejs/nodejs-15.2.1.ebuild 
b/net-libs/nodejs/nodejs-15.2.1.ebuild
index a69a9626746..b8481a2f946 100644
--- a/net-libs/nodejs/nodejs-15.2.1.ebuild
+++ b/net-libs/nodejs/nodejs-15.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 
toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/";
@@ -16,7 +16,7 @@ LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl 
system-icu +system-ssl systemtap test"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot 
+ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
        npm? ( ssl )
        system-icu? ( icu )
@@ -35,7 +35,8 @@ RDEPEND=">=app-arch/brotli-1.0.9
 BDEPEND="${PYTHON_DEPS}
        sys-apps/coreutils
        systemtap? ( dev-util/systemtap )
-       test? ( net-misc/curl )"
+       test? ( net-misc/curl )
+       pax_kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -84,6 +85,9 @@ src_prepare() {
                BUILDTYPE=Debug
        fi
 
+       # We need to disable mprotect on two files when it builds Bug 694100.
+       use pax_kernel && PATCHES+=( 
"${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
        default
 }
 
@@ -143,6 +147,8 @@ src_install() {
        local LIBDIR="${ED}/usr/$(get_libdir)"
        default
 
+       pax-mark -m "${ED}"/usr/bin/node
+
        # set up a symlink structure that node-gyp expects..
        dodir /usr/include/node/deps/{v8,uv}
        dosym . /usr/include/node/src