Attachment 201490 Details for Bug 233835 – v2

[patch] v2

node10.patch (text/plain), 2.36 KB, created by Piotr Kubaj on 2019-01-28 20:17:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-01-28 20:17:32 UTC

Size: 2.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 491354)
>+++ Makefile	(working copy)
>@@ -14,7 +14,6 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_powerpc64=	fails to build: KeyError: 'action'
> BROKEN_SSL=		openssl libressl libressl-devel
> BROKEN_SSL_REASON=	Node.js 10.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled
> ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc64
>@@ -33,6 +32,7 @@
> # 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
>+OPTIONS_EXCLUDE_powerpc64=	DTRACE
> 
> BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
> BUNDLED_SSL_USES_OFF=		ssl
>@@ -76,7 +76,7 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} != amd64 && ${ARCH} != i386
>+.if ${ARCH} != amd64 && ${ARCH} != i386 && ${PORT_OPTIONS:MBUNDLED_SSL}
> CONFIGURE_ARGS+=--openssl-no-asm
> .endif
> 
>@@ -83,11 +83,16 @@
> .if ${CHOSEN_COMPILER_TYPE} == gcc
> # GCC does not expose std::snprintf() without this define
> CXXFLAGS+=	-D_GLIBCXX_USE_C99
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-common.gypi
> .endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
> 		${WRKSRC}/deps/v8/gypfiles/v8.gyp
>+.if ${CHOSEN_COMPILER_TYPE} == gcc
>+	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' \
>+		${WRKSRC}/common.gypi
>+.endif
> 
> post-configure:
> 	# Post-process Makefile and *.mk files created by node-gyp and remove
>Index: files/extra-patch-common.gypi
>===================================================================
>--- files/extra-patch-common.gypi	(nonexistent)
>+++ files/extra-patch-common.gypi	(working copy)
>@@ -0,0 +1,11 @@
>+--- common.gypi.orig	2018-11-29 19:32:11 UTC
>++++ common.gypi
>+@@ -507,7 +507,7 @@
>+       }],
>+       ['OS=="freebsd"', {
>+         'ldflags': [
>+-          '-Wl,--export-dynamic',
>++          '-Wl,--export-dynamic -Wl,-rpath=/usr/local/lib/gcc%%GCC_DEFAULT%% -L/usr/local/lib/gcc%%GCC_DEFAULT%%',
>+         ],
>+       }]
>+     ],
>
>Property changes on: files/extra-patch-common.gypi
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 233835: 199908 | 201490