Cleanup and update the QJS dependency ##build

shlr/qjs/Makefile

@@ -1,28 +1,5 @@
 include deps.mk
 
-# QJS_BRANCH?=quickjs-ng
-# USE_MINIFY=0
-# USE_UGLIFY=0
-# QJS_COMMIT=df44d662912c8999ae4cf6926500b33e03b53589
-# 
-# ifeq ($(QJS_BRANCH),frida)
-# 	QJS_NAME=quickjs-frida
-# 	QJS_GITURL=https://github.com/frida/quickjs
-# 	QJS_CFLAGS+=-DQJS_NAME="\\"$(QJS_NAME)\\""
-# 	QJS_CFLAGS+=-DQJS_FRIDA=1
-# else ifeq ($(QJS_BRANCH),quickjs-ng)
-# 	QJS_NAME=quickjs-ng
-# 	QJS_GITURL=https://github.com/quickjs-ng/quickjs
-# 	QJS_CFLAGS+=-DQJS_NAME="\\"$(QJS_NAME)\\""
-# 	QJS_CFLAGS+=-DQJS_FRIDA=0
-# else
-# 	QJS_NAME=quickjs-bellard
-# 	QJS_GITURL=https://github.com/bellard/quickjs
-# 	QJS_CFLAGS+=-DQJS_NAME="\\"$(QJS_NAME)\\""
-# 	QJS_CFLAGS+=-DQJS_FRIDA=0
-# endif
-
-#.PHONY: all
 
 QJS_CFLAGS+=-D QJS_LIBC=$(QJS_LIBC)
 QJS_CFLAGS+=-D QJS_NOABORT=1
@@ -32,10 +9,6 @@ QJS_CFLAGS+=-fvisibility=hidden
 
 QJS_LIBS+=-lr_core -lr_config -lr_cons
 
-#QJS_VERSION=$(shell cat src/VERSION)
-# XXX: Is version needed when there is QJS_VERSION_STRING?
-QJS_VERSION=0.6.1
-
 JS_CFILES:=js_repl.c js_r2papi.c js_require.c
 
 all: $(JS_CFILES)
@@ -46,21 +19,6 @@ node_modules:
 	mkdir -p node_modules
 	npm i
 
-# sync-qjs qjs-sync sync:
-# 	$(MAKE) $(QJS_NAME)
-# 	rm -rf src
-# 	mv $(QJS_NAME) src
-# 	rm -rf src/.git
-# 	mkdir -p src2
-# 	ls src
-# #	cp $(QJS_FILES) src/*.h src/Makefile src/VERSION src2/
-# 	cp $(QJS_FILES) src/*.h src/Makefile src2/
-# 	rm -rf src
-# 	mv src2 src
-# 	sed -i -e 's/CONFIG_VERSION/"$(QJS_VERSION)"/' src/quickjs.c
-# 	git add src
-# 	git rm -f src/quickjs.c-e
-
 NM=node_modules
 
 R2PAPI_FILES=
@@ -178,11 +136,5 @@ lang_qjs.${EXT_SO}: js_repl.c js_require.c
 	-$(CC) -flto -D 'CONFIG_VERSION="$(VERSION)"' -g -Oz -Wl,-dead_strip -std=c99 $(DUK_CFLAGS) -I quickjs $(QJS_CFLAGS) $(CFLAGS) -fPIC $(LDFLAGS_LIB) \
 		-o lang_qjs.$(EXT_SO) $(QJS_FILES) $(QJS_LIBS) qjs.c
 
-#$(QJS_NAME):
-#	git clone $(QJS_GITURL) $(QJS_NAME)
-#ifeq ($(QJS_BRANCH),quickjs-ng)
-#	cd $(QJS_NAME) && git reset --hard $(QJS_COMMIT)
-#endif
-
 o:
 	make clean && make && make user-install

subprojects/qjs.mk

@@ -1,7 +1,7 @@
 # This file is autogenerated by acr-wrap
 
 WRAP_wrap_git_url:=https://github.com/quickjs-ng/quickjs
-WRAP_wrap_git_revision:=7e292050a21d3dd5076f70116ae95cc5200c40c1
+WRAP_wrap_git_revision:=b9dbcf46768b7aed0fc6e208fbab851393f808de
 WRAP_wrap_git_directory:=qjs
 WRAP_wrap_git_patch_directory:=qjs
 WRAP_wrap_git_depth:=1

subprojects/qjs.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/quickjs-ng/quickjs
-revision = 7e292050a21d3dd5076f70116ae95cc5200c40c1
+revision = b9dbcf46768b7aed0fc6e208fbab851393f808de
 directory = qjs
 patch_directory = qjs
 depth = 1

sys/sanitize.sh

@@ -44,8 +44,6 @@ for a in $SANITIZE ; do
 	export CFLAGS="${CFLAGS} -fsanitize=$a"
 	if [ "$a" = leak ]; then
 		HAVE_LEAKS=0
-	elif [ "$a" = address ]; then
-		export CFLAGS="${CFLAGS} -D__ASAN__=1"
 	fi
 done
 if [ "${HAVE_LEAKS}" = 0 ]; then