CVS commit: pkgsrc/lang/quickjs

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Mar  7 14:38:03 UTC 2023

Modified Files:
        pkgsrc/lang/quickjs: Makefile distinfo
        pkgsrc/lang/quickjs/patches: patch-qjs.c

Log Message:
quickjs: make it build on macppc again, or more generally...

on non-CONFIG_BIGNUM platforms.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/quickjs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/quickjs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/quickjs/patches/patch-qjs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/quickjs/Makefile
diff -u pkgsrc/lang/quickjs/Makefile:1.10 pkgsrc/lang/quickjs/Makefile:1.11
--- pkgsrc/lang/quickjs/Makefile:1.10   Mon Mar 21 23:00:33 2022
+++ pkgsrc/lang/quickjs/Makefile        Tue Mar  7 14:38:03 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2022/03/21 23:00:33 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2023/03/07 14:38:03 he Exp $
 
 NAME=          quickjs
 QJS_DATE=      2021-03-27
 VERSION=       ${QJS_DATE:S/-//g}
 DISTNAME=      ${NAME}-${QJS_DATE}
 PKGNAME=       ${NAME}-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  https://bellard.org/quickjs/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/quickjs/distinfo
diff -u pkgsrc/lang/quickjs/distinfo:1.9 pkgsrc/lang/quickjs/distinfo:1.10
--- pkgsrc/lang/quickjs/distinfo:1.9    Sun Jan 30 10:55:03 2022
+++ pkgsrc/lang/quickjs/distinfo        Tue Mar  7 14:38:03 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2022/01/30 10:55:03 he Exp $
+$NetBSD: distinfo,v 1.10 2023/03/07 14:38:03 he Exp $
 
 BLAKE2s (quickjs-2021-03-27.tar.xz) = 840b2a3cb55944981b3c8c5e1797f59a25bc4199a6539173ffb49a31bb10a2bd
 SHA512 (quickjs-2021-03-27.tar.xz) = eeb810083484df213bc658a8703ca3ef094b7789c2b49eed86cb4068c9f9da401ad0300261d61a163c6ea82306f3ef50bf8e29a64920f704fd8958ef08a7286c
 Size (quickjs-2021-03-27.tar.xz) = 753556 bytes
 SHA1 (patch-Makefile) = 93c54ea3927caa449b6a14eb7ad9e96450ed7724
 SHA1 (patch-cutils.h) = db3fad2bd422d2886538819ef778d13a391d6935
-SHA1 (patch-qjs.c) = 2a2d778bb43540dc5289f84cd9df43162c1ce291
+SHA1 (patch-qjs.c) = fde4ea9db2b6e02bad03ea8f2965b7c74eab239a
 SHA1 (patch-qjsc.c) = b67cd008e9f9081c7d1afdc5c286522e5854a511
 SHA1 (patch-quickjs-libc.c) = 39c2b553ef04b308e7c477590edd345b62acc528
 SHA1 (patch-quickjs.c) = 4a76824a4ada669c640b2a7a05b73d9ee57503a5

Index: pkgsrc/lang/quickjs/patches/patch-qjs.c
diff -u pkgsrc/lang/quickjs/patches/patch-qjs.c:1.1 pkgsrc/lang/quickjs/patches/patch-qjs.c:1.2
--- pkgsrc/lang/quickjs/patches/patch-qjs.c:1.1 Thu Nov 14 21:20:04 2019
+++ pkgsrc/lang/quickjs/patches/patch-qjs.c     Tue Mar  7 14:38:03 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-qjs.c,v 1.1 2019/11/14 21:20:04 rillig Exp $
+$NetBSD: patch-qjs.c,v 1.2 2023/03/07 14:38:03 he Exp $
 
 Portability patch for NetBSD.
 
 --- qjs.c.orig 2019-10-27 10:55:35.000000000 +0000
 +++ qjs.c
-@@ -124,7 +124,7 @@ static inline size_t js_trace_malloc_usa
+@@ -146,7 +146,7 @@ static inline size_t js_trace_malloc_usa
      return malloc_size(ptr);
  #elif defined(_WIN32)
      return _msize(ptr);
@@ -13,7 +13,7 @@ Portability patch for NetBSD.
      return 0;
  #elif defined(__linux__)
      return malloc_usable_size(ptr);
-@@ -240,7 +240,7 @@ static const JSMallocFunctions trace_mf 
+@@ -268,7 +268,7 @@ static const JSMallocFunctions trace_mf 
      malloc_size,
  #elif defined(_WIN32)
      (size_t (*)(const void *))_msize,
@@ -22,3 +22,14 @@ Portability patch for NetBSD.
      NULL,
  #elif defined(__linux__)
      (size_t (*)(const void *))malloc_usable_size,
+@@ -454,8 +454,10 @@ int main(int argc, char **argv)
+         }
+     }
+ 
++#ifdef CONFIG_BIGNUM
+     if (load_jscalc)
+         bignum_ext = 1;
++#endif
+ 
+     if (trace_memory) {
+         js_trace_malloc_init(&trace_data);