diff --git a/pkg/jerryscript/Makefile b/pkg/jerryscript/Makefile index 1abed90352..df4a037a13 100644 --- a/pkg/jerryscript/Makefile +++ b/pkg/jerryscript/Makefile @@ -1,10 +1,12 @@ PKG_NAME=jerryscript PKG_URL=https://github.com/jerryscript-project/jerryscript.git -PKG_VERSION=56802c22a10b0d684ac93921ac28df891e320b4a +PKG_VERSION=e62b5b601bc1caa3e4d8172824988536ed6138f3 PKG_LICENSE=Apache-2.0 .PHONY: all +CFLAGS += -Wno-implicit-fallthrough + all: git-download @cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile $(MAKE) -C $(PKG_BUILDDIR) diff --git a/pkg/jerryscript/Makefile.dep b/pkg/jerryscript/Makefile.dep index c6c9bfcf81..5e38313cfe 100644 --- a/pkg/jerryscript/Makefile.dep +++ b/pkg/jerryscript/Makefile.dep @@ -1,3 +1,4 @@ ifneq (,$(filter jerryscript,$(USEPKG))) USEMODULE += jerryport-minimal + USEMODULE += jerryscript-ext endif diff --git a/pkg/jerryscript/Makefile.include b/pkg/jerryscript/Makefile.include index 557b55a3c8..fdf28101d4 100644 --- a/pkg/jerryscript/Makefile.include +++ b/pkg/jerryscript/Makefile.include @@ -1 +1,2 @@ -INCLUDES += -I$(PKGDIRBASE)/jerryscript/jerry-core/ +INCLUDES += -I$(PKGDIRBASE)/jerryscript/jerry-core/include +INCLUDES += -I$(PKGDIRBASE)/jerryscript/jerry-ext/include diff --git a/pkg/jerryscript/Makefile.jerryscript b/pkg/jerryscript/Makefile.jerryscript index e23e3c2d73..e396176c3f 100644 --- a/pkg/jerryscript/Makefile.jerryscript +++ b/pkg/jerryscript/Makefile.jerryscript @@ -26,8 +26,9 @@ libjerry: -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DMEM_HEAP_SIZE_KB=$(JERRYHEAP) - make -C $(BUILD_DIR) jerry-core jerry-port-default-minimal + make -C $(BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a + cp $(BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a include $(RIOTBASE)/Makefile.base