From 9a289d40faec2d697157c2d71124d385335193a4 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Sat, 2 Oct 2021 15:03:09 +0200
Subject: [PATCH] pkg/jerryscript: bump to 2.4.0

---
 pkg/jerryscript/Makefile         | 12 +++++++-----
 pkg/jerryscript/Makefile.dep     |  2 +-
 pkg/jerryscript/Makefile.include |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkg/jerryscript/Makefile b/pkg/jerryscript/Makefile
index 59324de1c1..94c84b063d 100644
--- a/pkg/jerryscript/Makefile
+++ b/pkg/jerryscript/Makefile
@@ -1,10 +1,11 @@
 PKG_NAME=jerryscript
 PKG_URL=https://github.com/jerryscript-project/jerryscript.git
-PKG_VERSION=23bba1c6d9048e9b37cceff05ec6501646e48791  # 2.3.0
+PKG_VERSION=8ba0d1b6ee5a065a42f3b306771ad8e3c0d819bc  # 2.4.0
 PKG_LICENSE=Apache-2.0
 
 include $(RIOTBASE)/pkg/pkg.mk
 
+JERRY_PROFILE ?= minimal # Other possible values are es.next, es5.1 and es2015-subset
 JERRY_HEAP ?= 16  # kB
 JERRY_STACK ?= 1  # kB
 JERRY_GC_LIMIT ?= 0  # Use default value, e.g. 1/32 of total heap size
@@ -37,10 +38,10 @@ endif
 all: $(BINDIR)/jerryscript.a
 
 $(BINDIR)/jerryscript.a: $(PKG_BUILD_DIR)/Makefile
-	"$(MAKE)" -C $(PKG_BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal
+	"$(MAKE)" -C $(PKG_BUILD_DIR) jerry-core jerry-ext jerry-port-default
 	@cp $(PKG_BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a
 	@cp $(PKG_BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
-	@cp $(PKG_BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a
+	@cp $(PKG_BUILD_DIR)/lib/libjerry-port-default.a $(BINDIR)/jerryscript-port-default.a
 
 $(PKG_BUILD_DIR)/Makefile:
 	cmake -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR) \
@@ -49,10 +50,11 @@ $(PKG_BUILD_DIR)/Makefile:
 	 -DCMAKE_C_COMPILER=$(CC) \
 	 -DCMAKE_C_COMPILER_WORKS=TRUE \
 	 -DENABLE_LTO=OFF \
-	 -DENABLE_ALL_IN_ONE=OFF \
+	 -DENABLE_AMALGAM=OFF \
 	 -DHAVE_TIME_H=0 \
 	 -DEXTERNAL_COMPILE_FLAGS="$(INCLUDES) $(EXT_CFLAGS)" \
-	 -DJERRY_LIBM=OFF \
+	 -DJERRY_MATH=OFF \
+	 -DJERRY_PROFILE=$(JERRY_PROFILE) \
 	 -DJERRY_CMDLINE=OFF \
 	 -DJERRY_VALGRIND=OFF \
 	 -DJERRY_GC_LIMIT=$(JERRY_GC_LIMIT) \
diff --git a/pkg/jerryscript/Makefile.dep b/pkg/jerryscript/Makefile.dep
index f6bba9c711..b7f69850cb 100644
--- a/pkg/jerryscript/Makefile.dep
+++ b/pkg/jerryscript/Makefile.dep
@@ -1,4 +1,4 @@
-USEMODULE += jerryport-minimal
+USEMODULE += jerryscript-port-default
 USEMODULE += jerryscript-ext
 
 # Jerryscript is only supported by 32-bit architectures
diff --git a/pkg/jerryscript/Makefile.include b/pkg/jerryscript/Makefile.include
index ad2a265f42..9aa63d72d3 100644
--- a/pkg/jerryscript/Makefile.include
+++ b/pkg/jerryscript/Makefile.include
@@ -1,8 +1,9 @@
 INCLUDES += -I$(PKGDIRBASE)/jerryscript/jerry-core/include
 INCLUDES += -I$(PKGDIRBASE)/jerryscript/jerry-ext/include
 
-ARCHIVES += $(BINDIR)/jerryscript.a $(BINDIR)/jerryscript-ext.a
-ARCHIVES += $(BINDIR)/jerryport-minimal.a
+ARCHIVES += $(BINDIR)/jerryscript.a
+ARCHIVES += $(BINDIR)/jerryscript-ext.a
+ARCHIVES += $(BINDIR)/jerryscript-port-default.a
 
 # Ensure MCPU is correctly exported to CMake variables when configuring the
 # Jerrycript build