Attachment 183805 Details for Bug 220282 – Build fix

[patch] Build fix

node.diff (text/plain), 2.72 KB, created by Andrew Turner on 2017-06-26 10:43:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Turner

Created: 2017-06-26 10:43:01 UTC

Size: 2.72 KB

patch

obsolete

>Index: www/node/Makefile
>===================================================================
>--- www/node/Makefile	(revision 444357)
>+++ www/node/Makefile	(working copy)
>@@ -24,6 +24,7 @@
> .endif
> 
> OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
>+OPTIONS_EXCLUDE_aarch64=	DTRACE
> 
> BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
> BUNDLED_SSL_USES_OFF=		ssl
>@@ -41,7 +42,7 @@
> 
> CONFLICTS_INSTALL=	node[456]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]*
> 
>-ONLY_FOR_ARCHS=	i386 amd64 armv6
>+ONLY_FOR_ARCHS=	i386 amd64 armv6 aarch64
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
> 		--without-npm \
> 		--shared-cares \
>Index: www/node/files/patch-deps_v8_src_base_cpu.cc
>===================================================================
>--- www/node/files/patch-deps_v8_src_base_cpu.cc	(nonexistent)
>+++ www/node/files/patch-deps_v8_src_base_cpu.cc	(working copy)
>@@ -0,0 +1,19 @@
>+--- 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
>+ 
>
>Property changes on: www/node/files/patch-deps_v8_src_base_cpu.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/node/files/patch-node.gyp
>===================================================================
>--- www/node/files/patch-node.gyp	(revision 444357)
>+++ www/node/files/patch-node.gyp	(working copy)
>@@ -1,6 +1,6 @@
>---- node.gyp.orig	2017-05-10 12:22:23 UTC
>-+++ node.gyp
>-@@ -513,6 +513,12 @@
>+--- node.gyp.orig	2017-06-19 14:11:48.227892000 +0000
>++++ node.gyp	2017-06-19 14:20:32.706682000 +0000
>+@@ -513,6 +513,18 @@
>                  '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
>                ],
>                'conditions': [
>@@ -10,6 +10,12 @@
> +                    '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
> +                  ]
> +                } ],
>++                [ 'target_arch=="arm64"', {
>++                  'action': [
>++                    'dtrace', '-64', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
>++                    '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
>++                  ]
>++                } ],
>                  [ 'target_arch=="ia32"', {
>                    'action': [
>                      'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',

Actions: View | Diff

Attachments on bug 220282: 183805 | 183912