diff options
-rwxr-xr-x | nodejs/build/nodejs.SlackBuild | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nodejs/build/nodejs.SlackBuild b/nodejs/build/nodejs.SlackBuild index bee42c7d..8c76c88a 100755 --- a/nodejs/build/nodejs.SlackBuild +++ b/nodejs/build/nodejs.SlackBuild @@ -97,18 +97,23 @@ fi case "$ARCH" in i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" + CONFARCH=ia32 ;; x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" + CONFARCH=x64 ;; armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" + CONFARCH=arm ;; arm) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" SLKLDFLAGS=""; LIBDIRSUFFIX="" + CONFARCH=arm ;; *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} + CONFARCH=$ARCH ;; esac @@ -187,11 +192,13 @@ sed -i deps/npm/lib/npm.js -e "s/'lib'/'lib${LIBDIRSUFFIX}'/" # Include the correct header: sed -i src/node_crypto.cc -e "s|math.h|cmath|" -# On Slackware 14.2 the system openssl is too old: +# On Slackware 14.2 the system's openssl as well as compiler is too old: if pkg-config --atleast-version 1.1 openssl; then OPENSSL_OPTS=" --shared-openssl " -else +elif [ "${ARCH}" == "x86_64" ]; then OPENSSL_OPTS=" " +else + OPENSSL_OPTS=" --openssl-no-asm " fi echo Building ... @@ -203,6 +210,7 @@ export CFLAGS="$SLKCFLAGS" --prefix=/usr \ --experimental-http-parser \ --shared-zlib \ + --dest-cpu=${CONFARCH} \ ${OPENSSL_OPTS} \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log |