diff --git a/srcpkgs/nodejs/nodejs-docs.template b/srcpkgs/nodejs/nodejs-docs.template index 764ca151a41..2faa71efaff 100644 --- a/srcpkgs/nodejs/nodejs-docs.template +++ b/srcpkgs/nodejs/nodejs-docs.template @@ -9,5 +9,5 @@ do_install() { vmove usr/share/man usr/share vmkdir usr/share/doc/nodejs - vcopy "doc/api/api/*" usr/share/doc/nodejs + cp -r ${wrksrc}/doc/api ${DESTDIR}/usr/share/doc/nodejs } diff --git a/srcpkgs/nodejs/nodejs.rshlibs b/srcpkgs/nodejs/nodejs.rshlibs index 647864a1784..41555d66d35 100644 --- a/srcpkgs/nodejs/nodejs.rshlibs +++ b/srcpkgs/nodejs/nodejs.rshlibs @@ -1,8 +1,5 @@ librt.so.1 -libssl.so.1 -libcrypto.so.1 libdl.so.2 -libz.so.1 libv8.so libstdc++.so.6 libgcc_s.so.1 diff --git a/srcpkgs/nodejs/patches/fix_v8_includes__git.patch b/srcpkgs/nodejs/patches/fix_v8_includes__git.patch new file mode 100644 index 00000000000..d43fc5a640e --- /dev/null +++ b/srcpkgs/nodejs/patches/fix_v8_includes__git.patch @@ -0,0 +1,31 @@ +diff --git a/configure b/configure +index 338ec3c..8dd6884 100755 +--- configure ++++ configure +@@ -330,7 +330,6 @@ def configure_v8(o): + o['libraries'] += ['-lv8'] + if options.shared_v8_includes: + o['include_dirs'] += [options.shared_v8_includes] +- o['variables']['node_shared_v8_includes'] = options.shared_v8_includes + + + def configure_openssl(o): +diff --git a/node.gyp b/node.gyp +index 0816442..933812e 100644 +--- node.gyp ++++ node.gyp +@@ -177,12 +177,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/node_etw_provider.rc', + ] + } ], +- [ 'node_shared_v8=="true"', { +- 'sources': [ +- '<(node_shared_v8_includes)/v8.h', +- '<(node_shared_v8_includes)/v8-debug.h', +- ], +- }, { ++ [ 'node_shared_v8=="false"', { + 'sources': [ + 'deps/v8/include/v8.h', + 'deps/v8/include/v8-debug.h', + diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 8186a033c2e..fb2807c5421 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,15 +1,15 @@ # Template file for 'nodejs' pkgname=nodejs -version=0.6.11 +version=0.8.0 homepage="http://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" makedepends="pkg-config openssl-devel v8-devel zlib-devel" fulldepends="python" -revision=2 +revision=1 short_desc="Evented I/O for V8 javascript" maintainer="davehome " license="MIT" -checksum=94bbdb2d62645fd2ad5b96e41cfec68abf004fd03fabaaf7d71c48b39013cbd1 +checksum=ecafca018b5109a28537633d0433d513f68b1bae7191a1821e8eaa84ccf128ee long_desc=" Node.js is a software system designed for writing highly-scalable internet applications, notably web servers. Programs are written in JavaScript, using @@ -33,11 +33,9 @@ subpackages="${pkgname}-devel ${pkgname}-docs" wrksrc=node-v${version} - - do_configure() { - ./configure --prefix=/usr --shared-v8 --shared-zlib + ./configure --prefix=/usr --shared-v8 } do_build()