nodejs-0.8.18: export DESTDIR to fix build with dash
PATCH 1/3 nodejs-0.8.18: export DESTDIR to fix build with dash
In reply to a message not in the archive* when building on machine with /bin/sh -> /bin/dash
DESTDIR is empty in install and it's trying to write to /usr/include and fails
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +2 -1
@@ -54,7 +54,8 @@ do_compile () { } do_install () { - DESTDIR=${D} oe_runmake install + export DESTDIR=${D} + oe_runmake install } RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
Signature · 1 line
1.8.1.2
PATCH 2/3 nodejs-0.8.18: prefix CC/CXX with STAGING_BINDIR_TOOLCHAIN
* this way there is smaller chance that gcc/g++/ld wrapper will cause fork bomb
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +14 -3
@@ -21,15 +21,26 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '- ARCHFLAGS ?= "" # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi +do_configure_prepend_class-target () { + TOOLCHAIN_CC_PREFIX="${STAGING_BINDIR_TOOLCHAIN}" + TOOLCHAIN_CXX_PREFIX="${STAGING_BINDIR_TOOLCHAIN}" +} +do_configure_prepend_class-native () { + NATIVE_CC=`which gcc` + NATIVE_CXX=`which g++` + TOOLCHAIN_CC_PREFIX=`dirname "${NATIVE_CC}"` + TOOLCHAIN_CXX_PREFIX=`dirname "${NATIVE_CXX}"` +} + do_configure () { echo '#!/bin/sh' > ${WORKDIR}/gcc - echo '${CC} $@' >> ${WORKDIR}/gcc + echo "${TOOLCHAIN_CC_PREFIX}/${CC} \$@" >> ${WORKDIR}/gcc echo '#!/bin/sh' > ${WORKDIR}/g++ - echo '${CXX} $@'>> ${WORKDIR}/g++ + echo "${TOOLCHAIN_CXX_PREFIX}/${CXX} \$@" >> ${WORKDIR}/g++ echo '#!/bin/sh' > ${WORKDIR}/ld - echo '${CXX} $@'>> ${WORKDIR}/ld + echo "${TOOLCHAIN_CXX_PREFIX}/${CXX} \$@" >> ${WORKDIR}/ld chmod +x ${WORKDIR}/gcc ${WORKDIR}/g++ ${WORKDIR}/ld
Signature · 1 line
1.8.1.2
PATCH 3/3 nodejs-0.8.18: use gcc/g++/ld wrappers also for native build
In reply to Martin Jansa* it was calling ld with g++ arguments
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 4 ---- 1 file changed, 4 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +0 -4
@@ -52,10 +52,6 @@ do_configure () { ./configure --prefix=${prefix} --without-snapshot ${ARCHFLAGS} } -do_compile_virtclass-native () { - make BUILDTYPE=Release -} - do_compile () { export PATH=${WORKDIR}:${PATH} export CC=gcc
Signature · 1 line
1.8.1.2