quickjs: fix build with ndk-r23

This commit is contained in:
Henrik Grimler 2021-10-10 17:17:14 +02:00
parent a118b17124
commit 8338d73146
2 changed files with 31 additions and 6 deletions

View File

@ -1,7 +1,24 @@
diff -uNr quickjs-2020-07-05/Makefile quickjs-2020-07-05.mod/Makefile
--- quickjs-2020-07-05/Makefile 2020-07-05 12:03:51.000000000 +0200
+++ quickjs-2020-07-05.mod/Makefile 2020-08-07 10:17:00.109022444 +0200
@@ -173,7 +173,7 @@
--- ./Makefile.orig 2021-10-10 17:13:11.147988944 +0200
+++ ./Makefile 2021-10-10 17:12:41.424662424 +0200
@@ -76,7 +76,7 @@
CFLAGS += -Wchar-subscripts -funsigned-char
CFLAGS += -MMD -MF $(OBJDIR)/$(@F).d
ifdef CONFIG_DEFAULT_AR
- AR=$(CROSS_PREFIX)ar
+ AR ?= $(CROSS_PREFIX)ar
else
ifdef CONFIG_LTO
AR=$(CROSS_PREFIX)llvm-ar
@@ -95,7 +95,7 @@
AR=$(CROSS_PREFIX)ar
endif
endif
-STRIP=$(CROSS_PREFIX)strip
+STRIP ?= $(CROSS_PREFIX)strip
ifdef CONFIG_WERROR
CFLAGS+=-Werror
endif
@@ -177,7 +177,7 @@
HOST_LIBS=-lm -ldl -lpthread
LIBS=-lm
ifndef CONFIG_WIN32
@ -9,4 +26,4 @@ diff -uNr quickjs-2020-07-05/Makefile quickjs-2020-07-05.mod/Makefile
+LIBS+=-ldl
endif
$(OBJDIR):
$(OBJDIR):

View File

@ -6,8 +6,16 @@ _YEAR=2021
_MONTH=03
_DAY=27
TERMUX_PKG_VERSION=1:${_YEAR}${_MONTH}${_DAY}
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://bellard.org/quickjs/quickjs-${_YEAR}-${_MONTH}-${_DAY}.tar.xz
TERMUX_PKG_SHA256=a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_NO_STATICSPLIT=true
TERMUX_PKG_EXTRA_MAKE_ARGS="CROSS_PREFIX=${TERMUX_HOST_PLATFORM}- CONFIG_CLANG=y CONFIG_DEFAULT_AR=y -W run-test262 -W run-test262-bn prefix=$TERMUX_PREFIX"
TERMUX_PKG_EXTRA_MAKE_ARGS="
CROSS_PREFIX=${TERMUX_HOST_PLATFORM}-
CONFIG_CLANG=y
CONFIG_DEFAULT_AR=y
-W run-test262
-W run-test262-bn
prefix=$TERMUX_PREFIX
"