diff options
author | fhajny <fhajny> | 2016-06-02 09:57:32 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2016-06-02 09:57:32 +0000 |
commit | 5cfee247bc9367713b9da188cdef50c00d4ad1e7 (patch) | |
tree | 5b4871a585eaf4b4f70b3932e72b63ee50375015 /lang/nodejs | |
parent | 633014e64c3e825a3ad2536b33736d60a2eb7ac0 (diff) | |
download | pkgsrc-5cfee247bc9367713b9da188cdef50c00d4ad1e7.tar.gz |
Remove the nodejs icu option and make nodejs use a system ICU
package by default. Expand existing patch to fix NetBSD 6 build.
Fixes PR pkg/51172.
Bump PKGREVISION for lang/nodejs and lang/nodejs4.
Diffstat (limited to 'lang/nodejs')
-rw-r--r-- | lang/nodejs/Makefile | 3 | ||||
-rw-r--r-- | lang/nodejs/Makefile.common | 4 | ||||
-rw-r--r-- | lang/nodejs/distinfo | 4 | ||||
-rw-r--r-- | lang/nodejs/options.mk | 9 | ||||
-rw-r--r-- | lang/nodejs/patches/patch-deps_v8_src_types.h | 7 |
5 files changed, 13 insertions, 14 deletions
diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile index 6a09422a754..07b50e7b601 100644 --- a/lang/nodejs/Makefile +++ b/lang/nodejs/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2016/05/18 13:26:44 fhajny Exp $ +# $NetBSD: Makefile,v 1.69 2016/06/02 09:57:32 fhajny Exp $ DISTNAME= node-v6.2.0 +PKGREVISION= 1 .include "../../lang/nodejs/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common index 2ceedd5aad3..eb54ea64392 100644 --- a/lang/nodejs/Makefile.common +++ b/lang/nodejs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2016/04/27 15:03:10 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.8 2016/06/02 09:57:32 fhajny Exp $ # used by lang/nodejs/Makefile # used by lang/nodejs4/Makefile @@ -25,6 +25,7 @@ GCC_REQD+= 4.8 CONFIG_SHELL= ${PYTHONBIN} CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --shared-zlib +CONFIGURE_ARGS+= --with-intl=system-icu PTHREAD_AUTO_VARS= yes CONFIGURE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd" @@ -60,4 +61,5 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/tool.mk" +.include "../../textproc/icu/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo index daf44fab68e..60ab5565001 100644 --- a/lang/nodejs/distinfo +++ b/lang/nodejs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.67 2016/05/27 23:30:51 fhajny Exp $ +$NetBSD: distinfo,v 1.68 2016/06/02 09:57:32 fhajny Exp $ SHA1 (node-v6.2.0.tar.gz) = 228a0c2ff23294778f226e5d7fc85fc2e80a3cd1 RMD160 (node-v6.2.0.tar.gz) = c6154b44a1c0786d8d5a3cf961c87d15e159c969 @@ -17,7 +17,7 @@ SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 0abf6a541f24da87dbb SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = eff609b75125dab536934bd8afa640955dcee674 SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = dd8cafadd2668f069dab8625f57fbd71a304db3e SHA1 (patch-deps_v8_src_log-utils.h) = 32bbf2de2af7a8ab6900a4d5e968dcc1357f6de2 -SHA1 (patch-deps_v8_src_types.h) = a15d1f13a577135a006e8ef0617c9476eb971fa3 +SHA1 (patch-deps_v8_src_types.h) = 250ab540fa28caeea034ed02b84182bc770cdf35 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3 SHA1 (patch-src_cares__wrap.cc) = d9510afd0cd4b0156a604d9197d9f97d6e3b291f SHA1 (patch-src_node.cc) = 7004baf140e252861494b4fb003beeaa8581be78 diff --git a/lang/nodejs/options.mk b/lang/nodejs/options.mk index 781b8fee320..ec6225b9b89 100644 --- a/lang/nodejs/options.mk +++ b/lang/nodejs/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.9 2016/05/30 19:52:49 tnn Exp $ +# $NetBSD: options.mk,v 1.10 2016/06/02 09:57:32 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.node -PKG_SUPPORTED_OPTIONS= openssl dtrace icu +PKG_SUPPORTED_OPTIONS= openssl dtrace PKG_SUGGESTED_OPTIONS= openssl .if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \ @@ -23,11 +23,6 @@ CONFIGURE_ARGS+= --without-dtrace # print-PLIST helper PRINT_PLIST_AWK+= {if ($$0 ~ /lib\/dtrace/) {$$0 = "$${PLIST.dtrace}" $$0;}} -.if !empty(PKG_OPTIONS:Micu) -CONFIGURE_ARGS+= --with-intl=system-icu -.include "../../textproc/icu/buildlink3.mk" -.endif - .if !empty(PKG_OPTIONS:Mopenssl) BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.2 .include "../../security/openssl/buildlink3.mk" diff --git a/lang/nodejs/patches/patch-deps_v8_src_types.h b/lang/nodejs/patches/patch-deps_v8_src_types.h index bfbe555db63..e303fe476ec 100644 --- a/lang/nodejs/patches/patch-deps_v8_src_types.h +++ b/lang/nodejs/patches/patch-deps_v8_src_types.h @@ -1,10 +1,10 @@ -$NetBSD: patch-deps_v8_src_types.h,v 1.2 2015/11/09 20:19:35 fhajny Exp $ +$NetBSD: patch-deps_v8_src_types.h,v 1.3 2016/06/02 09:57:32 fhajny Exp $ -NetBSD 6 doesn't have nearbyint. +NetBSD 6 doesn't have nearbyint/nearbyintf. --- deps/v8/src/types.h.orig 2015-10-29 12:22:04.000000000 +0000 +++ deps/v8/src/types.h -@@ -5,6 +5,13 @@ +@@ -5,6 +5,14 @@ #ifndef V8_TYPES_H_ #define V8_TYPES_H_ @@ -12,6 +12,7 @@ NetBSD 6 doesn't have nearbyint. +#include <sys/param.h> +#if __NetBSD_Version__ - 0 < 699001700 +#define nearbyint rint ++#define nearbyintf rintf +#endif +#endif + |