From ea1a8f9dc6bd70873590a9c8cc646f83450e4029 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Mon, 6 Apr 2020 04:22:46 +0300
Subject: testing/quickjs: upgrade to 2020-03-16

---
 testing/quickjs/00-makefile.patch | 51 ++++++++-------------------------------
 testing/quickjs/APKBUILD          | 12 ++++-----
 2 files changed, 16 insertions(+), 47 deletions(-)

(limited to 'testing/quickjs')

diff --git a/testing/quickjs/00-makefile.patch b/testing/quickjs/00-makefile.patch
index fc9cb15bfc..bc0a2a911c 100644
--- a/testing/quickjs/00-makefile.patch
+++ b/testing/quickjs/00-makefile.patch
@@ -6,20 +6,16 @@ Remove When: The default Makefile doesn't enforce 32 bit binaries and allows for
 3. Allow for static linking.
 --- a/Makefile	2019-09-04 19:14:04.134679886 -0400
 +++ b/Makefile	2019-09-04 19:15:42.761338716 -0400
-@@ -32,9 +32,8 @@
- # consider warnings as errors (for development)
+@@ -33,6 +33,7 @@
  #CONFIG_WERROR=y
--
--ifndef CONFIG_WIN32
  # force 32 bit build for some utilities
--CONFIG_M32=y
--endif
-+#CONFIG_M32=y
+ #CONFIG_M32=y
 +#CONFIG_STATIC=y
-+
+ 
  ifdef CONFIG_DARWIN
  # use clang instead of gcc
-@@ -100,4 +99,7 @@
+@@ -105,6 +106,9 @@
+ CFLAGS_OPT=$(CFLAGS) -O2
  CFLAGS_NOLTO:=$(CFLAGS_OPT)
  LDFLAGS=-g
 +ifdef CONFIG_STATIC
@@ -27,7 +23,9 @@ Remove When: The default Makefile doesn't enforce 32 bit binaries and allows for
 +endif
  ifdef CONFIG_LTO
  CFLAGS_SMALL+=-flto
-@@ -113,9 +115,9 @@
+ CFLAGS_OPT+=-flto
+@@ -118,11 +122,11 @@
+ CFLAGS+=-fsanitize=address
  LDFLAGS+=-fsanitize=address
  endif
 -ifdef CONFIG_WIN32
@@ -39,34 +37,5 @@ Remove When: The default Makefile doesn't enforce 32 bit binaries and allows for
  endif
 +endif
  
- PROGS=qjs$(EXE) qjsbn$(EXE) qjsc qjsbnc run-test262 run-test262-bn
-@@ -149,5 +151,5 @@
- QJSBN_OBJS=$(OBJDIR)/qjs.bn.o $(OBJDIR)/repl-bn.bn.o $(OBJDIR)/qjscalc.bn.o $(QJSBN_LIB_OBJS)
- 
--LIBS=-lm
-+LIBS=-lm -pthread
- ifndef CONFIG_WIN32
- LIBS+=-ldl
-@@ -235,17 +237,17 @@
- 
- run-test262: $(OBJDIR)/run-test262.o $(QJS_LIB_OBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -lpthread
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- run-test262-bn: $(OBJDIR)/run-test262.bn.o $(QJSBN_LIB_OBJS)
--	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -lpthread
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- run-test262-debug: $(patsubst %.o, %.debug.o, $(OBJDIR)/run-test262.o $(QJS_LIB_OBJS))
--	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -lpthread
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- run-test262-32: $(patsubst %.o, %.m32.o, $(OBJDIR)/run-test262.o $(QJS_LIB_OBJS))
--	$(CC) -m32 $(LDFLAGS) -o $@ $^ $(LIBS) -lpthread
-+	$(CC) -m32 $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- run-test262-bn32: $(patsubst %.o, %.m32.o, $(OBJDIR)/run-test262.bn.o $(QJSBN_LIB_OBJS))
--	$(CC) -m32 $(LDFLAGS) -o $@ $^ $(LIBS) -lpthread
-+	$(CC) -m32 $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- # object suffix order: bn, nolto, [m32|m32s]
+ PROGS=qjs$(EXE) qjsc$(EXE) run-test262
+ ifneq ($(CROSS_PREFIX),)
diff --git a/testing/quickjs/APKBUILD b/testing/quickjs/APKBUILD
index 9203091ce7..82282aba0e 100644
--- a/testing/quickjs/APKBUILD
+++ b/testing/quickjs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Chloe Kudryavtsev <toast@toastin.space>
-pkgname="quickjs"
-_pkgver=2019-09-01
+pkgname=quickjs
+_pkgver=2020-03-16
 pkgver=0.${_pkgver//-}
 pkgrel=0
 pkgdesc="A small and embeddable Javascript engine"
@@ -16,7 +16,7 @@ builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
 	make CONFIG_STATIC=y
-	for bin in qjs qjsc qjsbn qjsbnc; do
+	for bin in qjs qjsc ; do
 		cp $bin $bin.static
 	done
 	make clean
@@ -30,7 +30,7 @@ check() {
 
 package() {
 	make install prefix="$pkgdir"/usr
-	for bin in qjs.static qjsc.static qjsbn.static qjsbnc.static; do
+	for bin in qjs.static qjsc.static ; do
 		install -Dm755 $bin "$pkgdir"/usr/bin/$bin
 	done
 	for doc in doc/*.html; do
@@ -44,5 +44,5 @@ static() {
 	mv "$pkgdir"/usr/bin/*.static "$subpkgdir"/usr/bin/
 }
 
-sha512sums="aaa2de18c36f4e49a81669d200e5b80decba05ebb3e4d08c3c602cdd57b7edfa682289c26b727a3533fbe783a884efba806e3a1be9f9d9fc5de9ff502634304c  quickjs-2019-09-01.tar.xz
-7fb6e9fa9fdbe5967eaebd3530b4ea38bcea3d854746c52513d3ea8b4f01c25969e42e19e974b97da87f6d89d21aced3c548e34dfa7a809c2f8799c5d967fff6  00-makefile.patch"
+sha512sums="04b017c6bfd50b3d5029946178eb870270ca146a2ca99eb142f91acf0b8e04ce02e3e99549ee9832706aed72849beaaf33f95662aad6172a8cf109a0d78d8370  quickjs-2020-03-16.tar.xz
+510831029ef4f76ea159ce22b81ff679d0f99482347802545b2f7071b0b48c631a947f57d350e6482b2cce058533f9175ea354b77fa3a5b4741cfa8028e8b249  00-makefile.patch"
-- 
cgit v1.2.3