From 769fad6806d80fac21fe59b4106a645723b51e4f Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 24 Nov 2017 21:07:06 -0800 Subject: [PATCH] New package: nodejs-lts-8.9.0 --- etc/defaults.virtual | 1 + srcpkgs/netdata/template | 4 +-- srcpkgs/nodejs-lts/template | 55 +++++++++++++++++++++++++++++++++++++ srcpkgs/nodejs-lts/update | 2 ++ srcpkgs/nodejs/template | 4 ++- srcpkgs/yarn-bin/template | 4 +-- srcpkgs/yarn/template | 6 ++-- 7 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/nodejs-lts/template create mode 100644 srcpkgs/nodejs-lts/update diff --git a/etc/defaults.virtual b/etc/defaults.virtual index 91096a2fea1..e9fe378f6ac 100644 --- a/etc/defaults.virtual +++ b/etc/defaults.virtual @@ -24,6 +24,7 @@ emacs emacs java-environment openjdk java-runtime openjdk-jre libudev eudev-libudev +nodejs-runtime nodejs ntp-daemon chrony phonon-backend phonon-backend-gstreamer phonon-qt5-backend phonon-qt5-backend-gstreamer diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index bb482e6c233..cfb4f3924b8 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,7 +1,7 @@ # Template file for 'netdata' pkgname=netdata version=1.8.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="zlib-devel" @@ -23,7 +23,7 @@ post_install() { netdata-plugins-nodejs_package() { short_desc+=" - NodeJS Plugins" - depends="${sourcepkg}>=${version}_${revision} nodejs" + depends="${sourcepkg}>=${version}_${revision} virtual?nodejs-runtime" noarch=yes pkg_install() { vmove usr/libexec/netdata/plugins.d/node.d.plugin diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template new file mode 100644 index 00000000000..44df0d0556f --- /dev/null +++ b/srcpkgs/nodejs-lts/template @@ -0,0 +1,55 @@ +# Template file for 'nodejs-lts' +pkgname=nodejs-lts +version=8.9.0 +revision=1 +wrksrc=node-v${version} +hostmakedepends="pkg-config python $(vopt_if icu icu)" +makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) + $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if http_parser http-parser-devel)" +short_desc="Evented I/O for V8 javascript" +maintainer="Michael Aldridge " +license="MIT" +homepage="https://nodejs.org/" +distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" +checksum=00b422827f37913576f8e5059c84acab364375cfbfcc083652191165f709de6c + +build_options="ssl libuv http_parser icu" +desc_option_libuv="Enable shared libuv" +desc_option_http_parser="Enable shared http-parser" +desc_option_icu="Enable shared icu" +build_options_default="libuv http_parser icu" + +replaces="iojs>=0" +conflicts="nodejs" +provides="nodejs-runtime-0_1" + +do_configure() { + local _args + + export LD="$CXX" + if [ "$CROSS_BUILD" ]; then + case "$XBPS_TARGET_MACHINE" in + arm*) _args="--dest-cpu=arm --without-snapshot" ;; + aarch64*) _args="--dest-cpu=arm64 --without-snapshot" ;; + *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}\n" ;; + esac + fi + ./configure --prefix=/usr --shared-zlib \ + $(vopt_if icu --with-intl=system-icu) \ + $(vopt_if http_parser --shared-http-parser) \ + $(vopt_if ssl --shared-openssl) \ + $(vopt_if libuv --shared-libuv) ${_args} +} +do_build() { + if [ "$CROSS_BUILD" ]; then + make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1 + else + make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 + fi +} +do_install() { + make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install + vlicense LICENSE + rm -r $DESTDIR/usr/include +} diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update new file mode 100644 index 00000000000..ccd29b0ebd3 --- /dev/null +++ b/srcpkgs/nodejs-lts/update @@ -0,0 +1,2 @@ +site=https://nodejs.org/dist +pattern='v\K[\d.]+(?=\/)' diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index c9aefa16d89..924b18ab900 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs version=9.1.0 -revision=1 +revision=2 wrksrc=node-v${version} hostmakedepends="pkg-config python $(vopt_if icu icu)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) @@ -21,6 +21,8 @@ desc_option_icu="Enable shared icu" build_options_default="libuv http_parser icu" replaces="iojs>=0" +conflicts="nodejs-lts" +provides="nodejs-runtime-0_1" do_configure() { local _args diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template index 1ee83bdecb7..aa0434e006c 100644 --- a/srcpkgs/yarn-bin/template +++ b/srcpkgs/yarn-bin/template @@ -1,8 +1,8 @@ # Template file for 'yarn-bin' pkgname=yarn-bin version=1.3.2 -revision=1 -depends="nodejs" +revision=2 +depends="virtual?nodejs-runtime" short_desc="Fast, reliable, and secure dependency management - precompiled binaries" maintainer="Michael Aldridge " license="2-cause-BSD" diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template index 4e6899a4063..e8670d65e6a 100644 --- a/srcpkgs/yarn/template +++ b/srcpkgs/yarn/template @@ -1,9 +1,9 @@ # Template file for 'yarn' pkgname=yarn version=1.3.2 -revision=1 -hostmakedepends="yarn-bin" -depends="nodejs" +revision=2 +hostmakedepends="yarn-bin nodejs" +depends="virtual?nodejs-runtime" short_desc="Fast, reliable, and secure dependency management" maintainer="Michael Aldridge " license="2-cause-BSD"