commit: aaa41b69535aac00ba32b1f48c711bb7aaa36fb4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 12:12:55 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 12:15:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa41b69
net-libs/nodejs: Update python interpreter configuration
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-libs/nodejs/nodejs-13.0.1.ebuild | 7 ++-----
net-libs/nodejs/nodejs-13.1.0.ebuild | 7 ++-----
net-libs/nodejs/nodejs-99999999.ebuild | 7 ++-----
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/net-libs/nodejs/nodejs-13.0.1.ebuild
b/net-libs/nodejs/nodejs-13.0.1.ebuild
index 64dd1ca4d15..56bbeb5526f 100644
--- a/net-libs/nodejs/nodejs-13.0.1.ebuild
+++ b/net-libs/nodejs/nodejs-13.0.1.ebuild
@@ -60,9 +60,6 @@ src_prepare() {
# https://code.google.com/p/gyp/issues/detail?id=260
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py ||
die
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp
|| die
-
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -119,7 +116,7 @@ src_configure() {
GYP_DEFINES="linux_use_gold_flags=0
linux_use_bundled_binutils=0
linux_use_bundled_gold=0" \
- "${PYTHON}" configure \
+ "${EPYTHON}" configure.py \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
$(use_with systemtap dtrace) \
@@ -192,7 +189,7 @@ src_install() {
src_test() {
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel
sequential || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel
sequential || die
}
pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-13.1.0.ebuild
b/net-libs/nodejs/nodejs-13.1.0.ebuild
index 64dd1ca4d15..56bbeb5526f 100644
--- a/net-libs/nodejs/nodejs-13.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.1.0.ebuild
@@ -60,9 +60,6 @@ src_prepare() {
# https://code.google.com/p/gyp/issues/detail?id=260
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py ||
die
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp
|| die
-
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -119,7 +116,7 @@ src_configure() {
GYP_DEFINES="linux_use_gold_flags=0
linux_use_bundled_binutils=0
linux_use_bundled_gold=0" \
- "${PYTHON}" configure \
+ "${EPYTHON}" configure.py \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
$(use_with systemtap dtrace) \
@@ -192,7 +189,7 @@ src_install() {
src_test() {
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel
sequential || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel
sequential || die
}
pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild
b/net-libs/nodejs/nodejs-99999999.ebuild
index e5e6f8a9d81..e36828c990a 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -56,9 +56,6 @@ src_prepare() {
# https://code.google.com/p/gyp/issues/detail?id=260
sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py ||
die
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp
|| die
-
# less verbose install output (stating the same as portage, basically)
sed -i -e "/print/d" tools/install.py || die
@@ -115,7 +112,7 @@ src_configure() {
GYP_DEFINES="linux_use_gold_flags=0
linux_use_bundled_binutils=0
linux_use_bundled_gold=0" \
- "${PYTHON}" configure \
+ "${EPYTHON}" configure.py \
--prefix="${EPREFIX}"/usr \
--dest-cpu=${myarch} \
$(use_with systemtap dtrace) \
@@ -188,7 +185,7 @@ src_install() {
src_test() {
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel
sequential || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel
sequential || die
}
pkg_postinst() {
