Date: Sun, 25 Oct 2020 17:17:32 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553276 - in head/lang/quickjs: . files Message-ID: <202010251717.09PHHWtq018760@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sun Oct 25 17:17:32 2020 New Revision: 553276 URL: https://svnweb.freebsd.org/changeset/ports/553276 Log: lang/quickjs: Update 2020.04.12 -> 2020.09.06 PR: 250592 Submitted by: swills Modified: head/lang/quickjs/Makefile head/lang/quickjs/distinfo head/lang/quickjs/files/patch-qjs.c head/lang/quickjs/files/patch-quickjs-libc.c head/lang/quickjs/files/patch-quickjs.c Modified: head/lang/quickjs/Makefile ============================================================================== --- head/lang/quickjs/Makefile Sun Oct 25 17:10:42 2020 (r553275) +++ head/lang/quickjs/Makefile Sun Oct 25 17:17:32 2020 (r553276) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= quickjs -DISTVERSION= 2020.04.12 +DISTVERSION= 2020.09.06 CATEGORIES= lang devel MASTER_SITES= https://bellard.org/${PORTNAME}/ DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g} Modified: head/lang/quickjs/distinfo ============================================================================== --- head/lang/quickjs/distinfo Sun Oct 25 17:10:42 2020 (r553275) +++ head/lang/quickjs/distinfo Sun Oct 25 17:17:32 2020 (r553276) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590816786 -SHA256 (quickjs-2020-04-12.tar.xz) = 22b15f2cc910289821379dc8d314d35ef492f6d69d4419c9bcb1b2263e9d71c8 -SIZE (quickjs-2020-04-12.tar.xz) = 741060 +TIMESTAMP = 1603622497 +SHA256 (quickjs-2020-09-06.tar.xz) = 0021a3e8cdc6b61e225411d05e2841d2437e1ccf4b4cabb9a5f7685ebfb57717 +SIZE (quickjs-2020-09-06.tar.xz) = 753080 Modified: head/lang/quickjs/files/patch-qjs.c ============================================================================== --- head/lang/quickjs/files/patch-qjs.c Sun Oct 25 17:10:42 2020 (r553275) +++ head/lang/quickjs/files/patch-qjs.c Sun Oct 25 17:17:32 2020 (r553276) @@ -1,20 +1,11 @@ ---- qjs.c.orig 2019-09-18 18:34:20 UTC +--- qjs.c.orig 2020-09-06 09:31:51 UTC +++ qjs.c -@@ -130,7 +130,7 @@ static inline size_t js_trace_malloc_usable_size(void - return malloc_usable_size(ptr); - #else - /* change this to `return 0;` if compilation fails */ -- return malloc_usable_size(ptr); -+ return 0; //return malloc_usable_size(ptr); +@@ -36,6 +36,8 @@ + #include <malloc/malloc.h> + #elif defined(__linux__) + #include <malloc.h> ++#elif defined(__FreeBSD__) ++#include <malloc_np.h> #endif - } -@@ -246,7 +246,7 @@ static const JSMallocFunctions trace_mf = { - (size_t (*)(const void *))malloc_usable_size, - #else - /* change this to `NULL,` if compilation fails */ -- malloc_usable_size, -+ NULL, //malloc_usable_size, - #endif - }; - + #include "cutils.h" Modified: head/lang/quickjs/files/patch-quickjs-libc.c ============================================================================== --- head/lang/quickjs/files/patch-quickjs-libc.c Sun Oct 25 17:10:42 2020 (r553275) +++ head/lang/quickjs/files/patch-quickjs-libc.c Sun Oct 25 17:17:32 2020 (r553276) @@ -1,17 +1,18 @@ ---- quickjs-libc.c.orig 2020-04-12 13:18:13 UTC +--- quickjs-libc.c.orig 2020-09-06 09:31:51 UTC +++ quickjs-libc.c -@@ -45,9 +45,13 @@ - #include <termios.h> +@@ -47,8 +47,14 @@ #include <sys/ioctl.h> #include <sys/wait.h> + -#if defined(__APPLE__) ++#if defined(__FreeBSD__) ++extern char **environ; ++#endif ++ +#if defined(__APPLE__) || defined(__FreeBSD__) typedef sig_t sighandler_t; - #endif +#endif -+ -+#if defined(__FreeBSD__) -+extern char **environ; - #endif - - #include "cutils.h" ++#if defined(__APPLE__) + #if !defined(environ) + #include <crt_externs.h> + #define environ (*_NSGetEnviron()) Modified: head/lang/quickjs/files/patch-quickjs.c ============================================================================== --- head/lang/quickjs/files/patch-quickjs.c Sun Oct 25 17:10:42 2020 (r553275) +++ head/lang/quickjs/files/patch-quickjs.c Sun Oct 25 17:17:32 2020 (r553276) @@ -1,11 +1,11 @@ ---- quickjs.c.orig 2020-04-12 13:18:13 UTC +--- quickjs.c.orig 2020-09-06 09:31:51 UTC +++ quickjs.c -@@ -1694,7 +1694,7 @@ static const JSMallocFunctions def_malloc_funcs = { - (size_t (*)(const void *))malloc_usable_size, - #else - /* change this to `NULL,` if compilation fails */ -- malloc_usable_size, -+ NULL, //malloc_usable_size, +@@ -36,6 +36,8 @@ + #include <malloc/malloc.h> + #elif defined(__linux__) + #include <malloc.h> ++#elif defined(__FreeBSD__) ++#include <malloc_np.h> #endif - }; + #include "cutils.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010251717.09PHHWtq018760>