Attachment #183805 for bug #220282

Lines 24-29 Link Here

(-)www/node/Makefile (-1 / +2 lines)
24	.endif	24	.endif
25		25
26	OPTIONS_EXCLUDE_FreeBSD_10= DTRACE	26	OPTIONS_EXCLUDE_FreeBSD_10= DTRACE
		27	OPTIONS_EXCLUDE_aarch64= DTRACE
27		28
28	BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation	29	BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation
29	BUNDLED_SSL_USES_OFF= ssl	30	BUNDLED_SSL_USES_OFF= ssl
Lines 41-47 Link Here
41		42
42	CONFLICTS_INSTALL= node[456]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]*	43	CONFLICTS_INSTALL= node[456]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]*
43		44
44	ONLY_FOR_ARCHS= i386 amd64 armv6	45	ONLY_FOR_ARCHS= i386 amd64 armv6 aarch64
45	CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \	46	CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
46	--without-npm \	47	--without-npm \
47	--shared-cares \	48	--shared-cares \




--- deps/v8/src/base/cpu.cc.orig	2017-06-19 14:24:53.928317000 +0000
+++ deps/v8/src/base/cpu.cc	2017-06-19 14:24:57.294664000 +0000
@@ -601,6 +601,7 @@
 
 #elif V8_HOST_ARCH_ARM64
 
+#if V8_OS_LINUX
   CPUInfo cpu_info;
 
   // Extract implementor from the "CPU implementer" field.
@@ -634,6 +635,8 @@
     }
     delete[] part;
   }
+
+#endif  // V8_OS_LINUX
 
 #elif V8_HOST_ARCH_PPC
 

Lines 1-6 Link Here

(-)www/node/files/patch-node.gyp (-3 / +9 lines)
1	--- node.gyp.orig 2017-05-10 12:22:23 UTC	1	--- node.gyp.orig 2017-06-19 14:11:48.227892000 +0000
2	+++ node.gyp	2	+++ node.gyp 2017-06-19 14:20:32.706682000 +0000
3	@@ -513,6 +513,12 @@	3	@@ -513,6 +513,18 @@
4	'<(OBJ_DIR)/node/src/node_dtrace_ustack.o'	4	'<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
5	],	5	],
6	'conditions': [	6	'conditions': [
Lines 10-15 Link Here
10	+ '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',	10	+ '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
11	+ ]	11	+ ]
12	+ } ],	12	+ } ],
		13	+ [ 'target_arch=="arm64"', {
		14	+ 'action': [
		15	+ 'dtrace', '-64', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
		16	+ '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
		17	+ ]
		18	+ } ],
13	[ 'target_arch=="ia32"', {	19	[ 'target_arch=="ia32"', {
14	'action': [	20	'action': [
15	'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',	21	'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',

Return to bug 220282

Line 0 Link Here

(-)www/node/files/patch-deps_v8_src_base_cpu.cc (+19 lines)
	1	--- deps/v8/src/base/cpu.cc.orig 2017-06-19 14:24:53.928317000 +0000
	2	+++ deps/v8/src/base/cpu.cc 2017-06-19 14:24:57.294664000 +0000
	3	@@ -601,6 +601,7 @@
	4
	5	#elif V8_HOST_ARCH_ARM64
	6
	7	+#if V8_OS_LINUX
	8	CPUInfo cpu_info;
	9
	10	// Extract implementor from the "CPU implementer" field.
	11	@@ -634,6 +635,8 @@
	12	}
	13	delete[] part;
	14	}
	15	+
	16	+#endif // V8_OS_LINUX
	17
	18	#elif V8_HOST_ARCH_PPC
	19