mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
lang/quickjs: Update 2020.04.12 -> 2020.09.06
PR: 250592 Submitted by: swills
This commit is contained in:
parent
e90ae4c812
commit
5d6a84cebe
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553276
5 changed files with 32 additions and 40 deletions
|
@ -1,7 +1,7 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= quickjs
|
PORTNAME= quickjs
|
||||||
DISTVERSION= 2020.04.12
|
DISTVERSION= 2020.09.06
|
||||||
CATEGORIES= lang devel
|
CATEGORIES= lang devel
|
||||||
MASTER_SITES= https://bellard.org/${PORTNAME}/
|
MASTER_SITES= https://bellard.org/${PORTNAME}/
|
||||||
DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g}
|
DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1590816786
|
TIMESTAMP = 1603622497
|
||||||
SHA256 (quickjs-2020-04-12.tar.xz) = 22b15f2cc910289821379dc8d314d35ef492f6d69d4419c9bcb1b2263e9d71c8
|
SHA256 (quickjs-2020-09-06.tar.xz) = 0021a3e8cdc6b61e225411d05e2841d2437e1ccf4b4cabb9a5f7685ebfb57717
|
||||||
SIZE (quickjs-2020-04-12.tar.xz) = 741060
|
SIZE (quickjs-2020-09-06.tar.xz) = 753080
|
||||||
|
|
|
@ -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
|
+++ qjs.c
|
||||||
@@ -130,7 +130,7 @@ static inline size_t js_trace_malloc_usable_size(void
|
@@ -36,6 +36,8 @@
|
||||||
return malloc_usable_size(ptr);
|
#include <malloc/malloc.h>
|
||||||
#else
|
#elif defined(__linux__)
|
||||||
/* change this to `return 0;` if compilation fails */
|
#include <malloc.h>
|
||||||
- return malloc_usable_size(ptr);
|
+#elif defined(__FreeBSD__)
|
||||||
+ return 0; //return malloc_usable_size(ptr);
|
+#include <malloc_np.h>
|
||||||
#endif
|
#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"
|
||||||
|
|
|
@ -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
|
+++ quickjs-libc.c
|
||||||
@@ -45,9 +45,13 @@
|
@@ -47,8 +47,14 @@
|
||||||
#include <termios.h>
|
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
|
|
||||||
-#if defined(__APPLE__)
|
-#if defined(__APPLE__)
|
||||||
+#if defined(__APPLE__) || defined(__FreeBSD__)
|
|
||||||
typedef sig_t sighandler_t;
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#if defined(__FreeBSD__)
|
+#if defined(__FreeBSD__)
|
||||||
+extern char **environ;
|
+extern char **environ;
|
||||||
#endif
|
+#endif
|
||||||
|
+
|
||||||
#include "cutils.h"
|
+#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||||
|
typedef sig_t sighandler_t;
|
||||||
|
+#endif
|
||||||
|
+#if defined(__APPLE__)
|
||||||
|
#if !defined(environ)
|
||||||
|
#include <crt_externs.h>
|
||||||
|
#define environ (*_NSGetEnviron())
|
||||||
|
|
|
@ -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
|
+++ quickjs.c
|
||||||
@@ -1694,7 +1694,7 @@ static const JSMallocFunctions def_malloc_funcs = {
|
@@ -36,6 +36,8 @@
|
||||||
(size_t (*)(const void *))malloc_usable_size,
|
#include <malloc/malloc.h>
|
||||||
#else
|
#elif defined(__linux__)
|
||||||
/* change this to `NULL,` if compilation fails */
|
#include <malloc.h>
|
||||||
- malloc_usable_size,
|
+#elif defined(__FreeBSD__)
|
||||||
+ NULL, //malloc_usable_size,
|
+#include <malloc_np.h>
|
||||||
#endif
|
#endif
|
||||||
};
|
|
||||||
|
|
||||||
|
#include "cutils.h"
|
||||||
|
|
Loading…
Add table
Reference in a new issue