pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

quickjs: remove; lang/quickjs is newer



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Mon Mar 21 22:55:34 2022 +0000
Changeset:	636e5e0fccda9f34363a17e4938d14818d4fcbb6

Modified Files:
	Makefile
Removed Files:
	quickjs/DESCR
	quickjs/Makefile
	quickjs/PLIST
	quickjs/distinfo
	quickjs/patches/patch-Makefile
	quickjs/patches/patch-cutils.h
	quickjs/patches/patch-qjs.c
	quickjs/patches/patch-qjsc.c
	quickjs/patches/patch-quickjs-libc.c
	quickjs/patches/patch-quickjs.c

Log Message:
quickjs: remove; lang/quickjs is newer

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=636e5e0fccda9f34363a17e4938d14818d4fcbb6

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

diffstat:
 Makefile                             |  1 -
 quickjs/DESCR                        | 26 ----------------
 quickjs/Makefile                     | 20 -------------
 quickjs/PLIST                        | 10 -------
 quickjs/distinfo                     | 11 -------
 quickjs/patches/patch-Makefile       | 58 ------------------------------------
 quickjs/patches/patch-cutils.h       | 22 --------------
 quickjs/patches/patch-qjs.c          | 24 ---------------
 quickjs/patches/patch-qjsc.c         | 16 ----------
 quickjs/patches/patch-quickjs-libc.c | 35 ----------------------
 quickjs/patches/patch-quickjs.c      | 39 ------------------------
 11 files changed, 262 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index df2376a74d..4835d1c936 100644
--- a/Makefile
+++ b/Makefile
@@ -4990,7 +4990,6 @@ SUBDIR+=	quarkcoin
 SUBDIR+=	quex
 SUBDIR+=	quickfix
 SUBDIR+=	quickie
-SUBDIR+=	quickjs
 SUBDIR+=	quiterss
 SUBDIR+=	qupzilla
 SUBDIR+=	quvi
diff --git a/quickjs/DESCR b/quickjs/DESCR
deleted file mode 100644
index 44d05e7a2c..0000000000
--- a/quickjs/DESCR
+++ /dev/null
@@ -1,26 +0,0 @@
-QuickJS is a small and embeddable Javascript engine. It supports
-the ES2019 specification including modules, asynchronous generators
-and proxies.
-
-It optionally supports mathematical extensions such as big integers
-(BigInt), big floating point numbers (BigFloat) and operator
-overloading.
-
-Main Features:
- * Small and easily embeddable: just a few C files, no external
-   dependency, 190 KiB of x86 code for a simple hello world program.
- * Fast interpreter with very low startup time: runs the 56000
-   tests of the ECMAScript Test Suite in about 100 seconds on a
-   single core of a desktop PC. The complete life cycle of a runtime
-   instance completes in less than 300 microseconds.
- * Almost complete ES2019 support including modules, asynchronous
-   generators and full Annex B support (legacy web compatibility).
- * Passes 100% of the ECMAScript Test Suite.
- * Can compile Javascript sources to executables with no external dependency.
- * Garbage collection using reference counting (to reduce memory
-   usage and have deterministic behavior) with cycle removal.
- * Mathematical extensions: BigInt, BigFloat, operator overloading,
-   bigint mode, math mode.
- * Command line interpreter with contextual colorization implemented
-   in Javascript.
- * Small built-in standard library with C library wrappers.
diff --git a/quickjs/Makefile b/quickjs/Makefile
deleted file mode 100644
index 510c830e37..0000000000
--- a/quickjs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME=	quickjs-2020-11-08
-CATEGORIES=	lang
-MASTER_SITES=	https://bellard.org/quickjs/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://bellard.org/quickjs/
-COMMENT=	Small and embeddable Javascript engine
-LICENSE=	mit
-
-USE_TOOLS=	gmake
-
-INSTALLATION_DIRS+=	bin lib/quickjs include/quickjs
-
-TEST_TARGET=	test
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/quickjs/PLIST b/quickjs/PLIST
deleted file mode 100644
index 47c14d6961..0000000000
--- a/quickjs/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-bin/qjs
-bin/qjsbn
-bin/qjsbnc
-bin/qjsc
-bin/qjscalc
-include/quickjs/quickjs-libc.h
-include/quickjs/quickjs.h
-lib/quickjs/libquickjs.a
-lib/quickjs/libquickjs.bn.a
diff --git a/quickjs/distinfo b/quickjs/distinfo
deleted file mode 100644
index 7323a75f75..0000000000
--- a/quickjs/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-RMD160 (quickjs-2020-11-08.tar.xz) = 2f3d9a51b341db48d6393a0c021e537936ac495e
-SHA512 (quickjs-2020-11-08.tar.xz) = d437813948269bab6046c0219eb20ccea45613073bea1c4eee5b553831fdaaa5e2165b14fcb436e86bf70d488200845f7821864abb6f40b115f0ef7f24971e02
-Size (quickjs-2020-11-08.tar.xz) = 752132 bytes
-SHA1 (patch-Makefile) = 25b040d2409ff28f7b5fc8f0e7b8a0ecb86174fb
-SHA1 (patch-cutils.h) = 3430f86dab2ec04be09bf81230e2e9e5c2f373e4
-SHA1 (patch-qjs.c) = acb1e66454f8c0263363e2e9564a89b86af3c649
-SHA1 (patch-qjsc.c) = 253e65f7d974940e4c1fc7d02f58b0ab3764d80b
-SHA1 (patch-quickjs-libc.c) = 126385954c57cf2cf18e9fedfebd5abbf672c2da
-SHA1 (patch-quickjs.c) = 7b43df0862cf97f87e78a6f3a82757294a19c9b3
diff --git a/quickjs/patches/patch-Makefile b/quickjs/patches/patch-Makefile
deleted file mode 100644
index 8facff9a08..0000000000
--- a/quickjs/patches/patch-Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-Adapt for NetBSD & pkgsrc.
-
---- Makefile.orig	2019-10-27 10:55:35.000000000 +0000
-+++ Makefile
-@@ -25,10 +25,17 @@
- ifeq ($(shell uname -s),Darwin)
- CONFIG_DARWIN=y
- endif
-+ifeq ($(shell uname -s),NetBSD)
-+CONFIG_NETBSD=y
-+endif
- # Windows cross compilation from Linux
- #CONFIG_WIN32=y
- # use link time optimization (smaller and faster executables but slower build)
- CONFIG_LTO=y
-+# Skip this for now, to support gcc5 without gcc-ar
-+ifdef CONFIG_NETBSD
-+CONFIG_LTO=
-+endif
- # consider warnings as errors (for development)
- #CONFIG_WERROR=y
- # force 32 bit build for some utilities
-@@ -41,7 +48,7 @@ CONFIG_DEFAULT_AR=y
- endif
- 
- # installation directory
--prefix=/usr/local
-+prefix=/usr/pkg
- 
- # use the gprof profiler
- #CONFIG_PROFILE=y
-@@ -174,10 +181,22 @@ QJS_LIB_OBJS+=$(OBJDIR)/libbf.o 
- QJS_OBJS+=$(OBJDIR)/qjscalc.o
- endif
- 
--HOST_LIBS=-lm -ldl -lpthread
-+HOST_LIBS=-lm
-+ifndef CONFIG_NETBSD
-+HOST_LIBS+=-ldl
-+HOST_LIBS+=-lpthread
-+else
-+HOST_LIBS+=-pthread
-+endif
- LIBS=-lm
-+
- ifndef CONFIG_WIN32
--LIBS+=-ldl -lpthread
-+ifndef CONFIG_NETBSD
-+LIBS+=-ldl
-+LIBS+=-lphtread
-+else
-+LIBS+=-pthread
-+endif
- endif
- 
- $(OBJDIR):
diff --git a/quickjs/patches/patch-cutils.h b/quickjs/patches/patch-cutils.h
deleted file mode 100644
index 70972cdbfe..0000000000
--- a/quickjs/patches/patch-cutils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Adapt to NetBSD.
-
---- cutils.h.orig	2019-07-09 17:49:47.000000000 +0000
-+++ cutils.h
-@@ -207,6 +207,7 @@ static inline void put_u8(uint8_t *tab, 
-     *tab = val;
- }
- 
-+#ifndef __NetBSD__
- static inline uint16_t bswap16(uint16_t x)
- {
-     return (x >> 8) | (x << 8);
-@@ -229,6 +230,7 @@ static inline uint64_t bswap64(uint64_t 
-         ((v & ((uint64_t)0xff << (1 * 8))) << (5 * 8)) | 
-         ((v & ((uint64_t)0xff << (0 * 8))) << (7 * 8));
- }
-+#endif /* __NetBSD__ */
- 
- /* XXX: should take an extra argument to pass slack information to the caller */
- typedef void *DynBufReallocFunc(void *opaque, void *ptr, size_t size);
diff --git a/quickjs/patches/patch-qjs.c b/quickjs/patches/patch-qjs.c
deleted file mode 100644
index c56fc73515..0000000000
--- a/quickjs/patches/patch-qjs.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Adapt to NetBSD.
-
---- qjs.c.orig	2019-07-09 17:49:47.000000000 +0000
-+++ qjs.c
-@@ -150,6 +150,8 @@ static inline size_t js_trace_malloc_usa
-     return 0;
- #elif defined(__linux__)
-     return malloc_usable_size(ptr);
-+#elif defined(__NetBSD__)
-+    return 0;
- #else
-     /* change this to `return 0;` if compilation fails */
-     return malloc_usable_size(ptr);
-@@ -266,6 +268,8 @@ static const JSMallocFunctions trace_mf 
-     NULL,
- #elif defined(__linux__)
-     (size_t (*)(const void *))malloc_usable_size,
-+#elif defined(__NetBSD__)
-+    NULL,
- #else
-     /* change this to `NULL,` if compilation fails */
-     malloc_usable_size,
diff --git a/quickjs/patches/patch-qjsc.c b/quickjs/patches/patch-qjsc.c
deleted file mode 100644
index 76f9b352cb..0000000000
--- a/quickjs/patches/patch-qjsc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Adapt to NetBSD.
-
---- qjsc.c.orig	2019-08-10 10:58:42.000000000 +0000
-+++ qjsc.c
-@@ -450,7 +450,9 @@ static int output_executable(const char 
-              lib_dir, bn_suffix, lto_suffix);
-     *arg++ = libjsname;
-     *arg++ = "-lm";
-+#if !defined(__NetBSD__)
-     *arg++ = "-ldl";
-+#endif
-     *arg++ = "-lpthread";
-     *arg = NULL;
-     
diff --git a/quickjs/patches/patch-quickjs-libc.c b/quickjs/patches/patch-quickjs-libc.c
deleted file mode 100644
index e4fed585d2..0000000000
--- a/quickjs/patches/patch-quickjs-libc.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Adapt to NetBSD.
-
---- quickjs-libc.c.orig	2019-08-10 10:58:42.000000000 +0000
-+++ quickjs-libc.c
-@@ -675,6 +675,10 @@ static JSValue js_std_unsetenv(JSContext
-     return JS_UNDEFINED;
- }
- 
-+#ifdef __NetBSD__
-+extern char **environ;
-+#endif
-+
- /* return an object containing the list of the available environment
-    variables. */
- static JSValue js_std_getenviron(JSContext *ctx, JSValueConst this_val,
-@@ -1892,7 +1896,7 @@ static void os_signal_handler(int sig_nu
-     os_pending_signals |= ((uint64_t)1 << sig_num);
- }
- 
--#if defined(_WIN32)
-+#if defined(_WIN32) || defined(__NetBSD__)
- typedef void (*sighandler_t)(int sig_num);
- #endif
- 
-@@ -3526,6 +3530,8 @@ void js_std_set_worker_new_context_func(
- #define OS_PLATFORM "darwin"
- #elif defined(EMSCRIPTEN)
- #define OS_PLATFORM "js"
-+#elif defined(__NetBSD__)
-+#define OS_PLATFORM "NetBSD"
- #else
- #define OS_PLATFORM "linux"
- #endif
diff --git a/quickjs/patches/patch-quickjs.c b/quickjs/patches/patch-quickjs.c
deleted file mode 100644
index bb464ebf96..0000000000
--- a/quickjs/patches/patch-quickjs.c
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-Adapt to NetBSD.
-
---- quickjs.c.orig	2019-10-27 10:55:35.000000000 +0000
-+++ quickjs.c
-@@ -111,6 +111,14 @@
- #include <pthread.h>
- #include <stdatomic.h>
- #include <errno.h>
-+
-+#if defined(__NetBSD__)
-+#if ATOMIC_LLONG_LOCK_FREE != 2
-+/* The code currently assumes the presence of 64-bit atomics */
-+/* ...but the current platform doesn't support it */
-+#undef CONFIG_ATOMICS
-+#endif
-+#endif
- #endif
- 
- enum {
-@@ -1680,6 +1688,8 @@ static inline size_t js_def_malloc_usabl
-     return 0;
- #elif defined(__linux__)
-     return malloc_usable_size(ptr);
-+#elif defined(__NetBSD__)
-+    return 0;
- #else
-     /* change this to `return 0;` if compilation fails */
-     return malloc_usable_size(ptr);
-@@ -1754,6 +1764,8 @@ static const JSMallocFunctions def_mallo
-     NULL,
- #elif defined(__linux__)
-     (size_t (*)(const void *))malloc_usable_size,
-+#elif defined(__NetBSD__)
-+    NULL,
- #else
-     /* change this to `NULL,` if compilation fails */
-     malloc_usable_size,


Home | Main Index | Thread Index | Old Index