Attachment 217379 Details for Bug 248167 – Patch against 14.6.0 (Main) & 14.4.0 (Quarterly)

[patch] Patch against 14.6.0 (Main) & 14.4.0 (Quarterly)

node.patch (text/plain), 1.83 KB, created by James French on 2020-08-20 14:39:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James French

Created: 2020-08-20 14:39:21 UTC

Size: 1.83 KB

patch

obsolete

>diff -urN www/node/Makefile www/node/Makefile
>--- www/node/Makefile	2020-08-20 22:35:42.938395000 +0800
>+++ www/node/Makefile	2020-08-20 22:34:41.987248000 +0800
>@@ -112,4 +112,10 @@
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_REL} >= 3700
>+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-tools_genv8constants.py
>+.endif
>+
>+.include <bsd.port.post.mk>
>diff -urN www/node/files/extra-patch-tools_genv8constants.py www/node/files/extra-patch-tools_genv8constants.py
>--- www/node/files/extra-patch-tools_genv8constants.py	1970-01-01 08:00:00.000000000 +0800
>+++ www/node/files/extra-patch-tools_genv8constants.py	2020-08-20 22:02:16.754641000 +0800
>@@ -0,0 +1,11 @@
>+--- tools/genv8constants.py.orig	2020-05-14 21:31:48 UTC
>++++ tools/genv8constants.py
>+@@ -20,7 +20,7 @@ if len(sys.argv) != 3:
>+ outfile = open(sys.argv[1], 'w')
>+ try:
>+   pipe = subprocess.Popen([ 'objdump', '-z', '-D', sys.argv[2] ],
>+-      bufsize=-1, stdout=subprocess.PIPE).stdout
>++      bufsize=-1, stdout=subprocess.PIPE, text=True).stdout
>+ except OSError as e:
>+   if e.errno == errno.ENOENT:
>+     print('''
>diff -urN www/node/files/patch-tools_genv8constants.py www/node/files/patch-tools_genv8constants.py
>--- www/node/files/patch-tools_genv8constants.py	2020-08-20 22:35:42.940082000 +0800
>+++ www/node/files/patch-tools_genv8constants.py	1970-01-01 08:00:00.000000000 +0800
>@@ -1,11 +0,0 @@
>---- tools/genv8constants.py.orig	2020-05-14 21:31:48 UTC
>-+++ tools/genv8constants.py
>-@@ -20,7 +20,7 @@ if len(sys.argv) != 3:
>- outfile = open(sys.argv[1], 'w')
>- try:
>-   pipe = subprocess.Popen([ 'objdump', '-z', '-D', sys.argv[2] ],
>--      bufsize=-1, stdout=subprocess.PIPE).stdout
>-+      bufsize=-1, stdout=subprocess.PIPE, text=True).stdout
>- except OSError as e:
>-   if e.errno == errno.ENOENT:
>-     print('''

Actions: View | Diff

Attachments on bug 248167: 216652 | 217379 | 217380 | 217385 | 217388 | 217389