From e8ef480f143ba5438dd86d2035e23d675f0595f4 Mon Sep 17 00:00:00 2001 From: "Ryan P.C. McQuen" Date: Fri, 4 Dec 2015 09:05:14 -0800 Subject: [PATCH] development/nodejs: Updated for version 4.2.3. Signed-off-by: Ryan P.C. McQuen --- development/nodejs/README | 4 ++++ development/nodejs/nodejs.SlackBuild | 13 ++++++++++--- development/nodejs/nodejs.info | 6 +++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/development/nodejs/README b/development/nodejs/README index f321e640e5..c070ea76f7 100644 --- a/development/nodejs/README +++ b/development/nodejs/README @@ -8,3 +8,7 @@ WARNING: nodejs will conflict with node. Either install the node package, or nodejs from SBo, but not both. Both packages include npm. + +nodejs is based off of iojs, you should test your project with nodejs before +switching from the node package. Due to significant breaking changes, +you may need to update your project to be compatible. diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild index 5c5564f6c8..a9fc3436e8 100644 --- a/development/nodejs/nodejs.SlackBuild +++ b/development/nodejs/nodejs.SlackBuild @@ -25,8 +25,8 @@ PRGNAM=nodejs SRCNAM=node -VERSION=${VERSION:-4.2.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.2.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -58,6 +58,12 @@ else LIBDIRSUFFIX="" fi +SHAREDOPENSSL="" +## use system openssl if the version number is high enough +if [ "`openssl version | grep '1.0.2'`" ]; then + SHAREDOPENSSL="--shared-openssl" +fi + set -eu rm -rf $PKG @@ -84,7 +90,8 @@ sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js ./configure \ --prefix=/usr \ - --shared-zlib + --shared-zlib \ + ${SHAREDOPENSSL} make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info index 42b6ce54a4..908d05d8f6 100644 --- a/development/nodejs/nodejs.info +++ b/development/nodejs/nodejs.info @@ -1,8 +1,8 @@ PRGNAM="nodejs" -VERSION="4.2.2" +VERSION="4.2.3" HOMEPAGE="https://nodejs.org/" -DOWNLOAD="https://github.com/nodejs/node/archive/v4.2.2.tar.gz" -MD5SUM="551b1538d0c7149228e57119ac209169" +DOWNLOAD="https://github.com/nodejs/node/archive/v4.2.3.tar.gz" +MD5SUM="e3958035438e26fc34bf28f59ef70cd2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""