Index: branches/2018Q3/www/node/Makefile =================================================================== --- branches/2018Q3/www/node/Makefile (revision 478353) +++ branches/2018Q3/www/node/Makefile (revision 478354) @@ -1,107 +1,106 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 10.5.0 +PORTVERSION= 10.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to build: KeyError: 'action' ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= BUNDLED_SSL DTRACE OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:2.7,build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node[4568]-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-cares \ --shared-libuv \ --shared-zlib SHEBANG_FILES= tools/specialize_node_d.py tools/genv8constants.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LIB_DEPENDS+= libcares.so:dns/c-ares\ libuv.so:devel/libuv .include .if empty(PORT_OPTIONS:MBUNDLED_SSL) .if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl-devel IGNORE= node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl-devel to /etc/make.conf or enable BUNDLED_SSL option .endif .if !empty(SSL_DEFAULT:Mlibressl*) IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL .endif .endif .include .if ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif .if ${COMPILER_TYPE} == gcc # GCC does not expose std::snprintf() without this define CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/deps/v8/gypfiles/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include Index: branches/2018Q3/www/node/distinfo =================================================================== --- branches/2018Q3/www/node/distinfo (revision 478353) +++ branches/2018Q3/www/node/distinfo (revision 478354) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529606187 -SHA256 (node-v10.5.0.tar.gz) = 2b61828fd32e79ed3e6cb4781dfa0d61d03739e30da2f68b3bab63d7f92a6d8d -SIZE (node-v10.5.0.tar.gz) = 35441207 +TIMESTAMP = 1534540377 +SHA256 (node-v10.9.0.tar.gz) = 1ed31ba75080b16193f1c7a351807481b1f7da08bfaf7172bc07f0cf07e6ea71 +SIZE (node-v10.9.0.tar.gz) = 35848393 Index: branches/2018Q3/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi =================================================================== --- branches/2018Q3/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi (revision 478353) +++ branches/2018Q3/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi (revision 478354) @@ -1,15 +1,15 @@ ---- deps/openssl/config/archs/linux-elf/asm/openssl.gypi.orig 2018-05-11 12:05:18 UTC +--- deps/openssl/config/archs/linux-elf/asm/openssl.gypi.orig 2018-08-15 13:53:23 UTC +++ deps/openssl/config/archs/linux-elf/asm/openssl.gypi -@@ -681,10 +681,10 @@ +@@ -683,10 +683,10 @@ 'POLY1305_ASM', ], 'openssl_cflags_linux-elf': [ - '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer', + '-Wall -O3 -pthread -DL_ENDIAN', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '', ], }, 'include_dirs': [ Index: branches/2018Q3/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi =================================================================== --- branches/2018Q3/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi (revision 478353) +++ branches/2018Q3/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi (revision 478354) @@ -1,15 +1,15 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2018-05-11 11:01:19 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2018-08-15 13:53:23 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi -@@ -652,10 +652,10 @@ +@@ -654,10 +654,10 @@ 'OPENSSL_PIC', ], 'openssl_cflags_linux-elf': [ - '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer', + '-Wall -O3 -pthread -DL_ENDIAN', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '', ], }, 'include_dirs': [ Index: branches/2018Q3/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc =================================================================== --- branches/2018Q3/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc (revision 478353) +++ branches/2018Q3/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc (revision 478354) @@ -1,22 +1,22 @@ ---- deps/v8/src/arm/cpu-arm.cc.orig 2017-06-15 11:55:20 UTC +--- deps/v8/src/arm/cpu-arm.cc.orig 2018-08-15 13:53:24 UTC +++ deps/v8/src/arm/cpu-arm.cc @@ -7,6 +7,9 @@ #ifdef __QNXNTO__ #include // for cache flushing. #undef MAP_TYPE +#elif defined(__FreeBSD__) +#include +#include // for cache flushing. #else #include // for cache flushing. #endif -@@ -24,6 +27,9 @@ void CpuFeatures::FlushICache(void* start, size_t size +@@ -24,6 +27,9 @@ void CpuFeatures::FlushICache(void* star #if !defined(USE_SIMULATOR) #if V8_OS_QNX msync(start, size, MS_SYNC | MS_INVALIDATE_ICACHE); +#elif defined(__FreeBSD__) + struct arm_sync_icache_args args = { .addr = (uintptr_t)start, .len = size }; + sysarch(ARM_SYNC_ICACHE, (void *)&args); #else register uint32_t beg asm("r0") = reinterpret_cast(start); register uint32_t end asm("r1") = beg + size; Index: branches/2018Q3/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc =================================================================== --- branches/2018Q3/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (revision 478353) +++ branches/2018Q3/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (revision 478354) @@ -1,50 +1,50 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-04-23 19:19:12 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-08-15 13:53:24 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc -@@ -86,5 +86,47 @@ std::vector OS::GetSharedLib +@@ -86,5 +86,47 @@ std::vector OS void OS::SignalCodeMovingGC() {} +#ifdef __arm__ + +bool OS::ArmUsingHardFloat() { +// GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify +// the Floating Point ABI used (PCS stands for Procedure Call Standard). +// We use these as well as a couple of other defines to statically determine +// what FP ABI used. +// GCC versions 4.4 and below don't support hard-fp. +// GCC versions 4.5 may support hard-fp without defining __ARM_PCS or +// __ARM_PCS_VFP. + +#define GCC_VERSION \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) +#if GCC_VERSION >= 40600 && !defined(__clang__) +#if defined(__ARM_PCS_VFP) + return true; +#else + return false; +#endif + +#elif GCC_VERSION < 40500 && !defined(__clang__) + return false; + +#else +#if defined(__ARM_PCS_VFP) + return true; +#elif defined(__ARM_PCS) || defined(__SOFTFP__) || defined(__SOFTFP) || \ + !defined(__VFP_FP__) + return false; +#else +#error \ + "Your version of compiler does not report the FP ABI compiled for." \ + "Please report it on this issue" \ + "http://code.google.com/p/v8/issues/detail?id=2140" + +#endif +#endif +#undef GCC_VERSION +} + +#endif // def __arm__ + } // namespace base } // namespace v8 Index: branches/2018Q3/www/node/files/patch-deps_v8_src_libsampler_sampler.cc =================================================================== --- branches/2018Q3/www/node/files/patch-deps_v8_src_libsampler_sampler.cc (revision 478353) +++ branches/2018Q3/www/node/files/patch-deps_v8_src_libsampler_sampler.cc (revision 478354) @@ -1,15 +1,15 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2018-04-24 14:41:27 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2018-08-15 13:53:25 UTC +++ deps/v8/src/libsampler/sampler.cc -@@ -550,9 +550,9 @@ void SignalHandler::FillRegisterState(void* context, R +@@ -550,9 +550,9 @@ void SignalHandler::FillRegisterState(vo state->sp = reinterpret_cast(mcontext.mc_rsp); state->fp = reinterpret_cast(mcontext.mc_rbp); #elif V8_HOST_ARCH_ARM - state->pc = reinterpret_cast(mcontext.mc_r15); - state->sp = reinterpret_cast(mcontext.mc_r13); - state->fp = reinterpret_cast(mcontext.mc_r11); + state->pc = reinterpret_cast(mcontext.__gregs[_REG_PC]); + state->sp = reinterpret_cast(mcontext.__gregs[_REG_SP]); + state->fp = reinterpret_cast(mcontext.__gregs[_REG_FP]); #endif // V8_HOST_ARCH_* #elif V8_OS_NETBSD #if V8_HOST_ARCH_IA32 Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 478353) +++ branches/2018Q3 (revision 478354) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r478194