Преглед изворни кода

quickjs: update to 2026-06-04

Waldemar Brodkorb пре 2 недеља
родитељ
комит
c3bbe8c974
2 измењених фајлова са 41 додато и 16 уклоњено
  1. 2 3
      package/quickjs/Makefile
  2. 39 13
      package/quickjs/patches/patch-Makefile

+ 2 - 3
package/quickjs/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		quickjs
-PKG_VERSION:=		2024-01-13
+PKG_VERSION:=		2026-06-04
 PKG_RELEASE:=		1
-PKG_HASH:=		3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03
+PKG_HASH:=		b376e839b322978313d929fd20663b11ba58b75df5a46c126dd19ea2fa70ad2a
 PKG_DESCR:=		javascript engine
 PKG_SECTION:=		dev/lang
 PKG_URL:=		https://bellard.org/quickjs/
@@ -17,7 +17,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,QUICKJS,quickjs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 XAKE_FLAGS+=		CROSS_PREFIX=$(TARGET_CROSS)
-TARGET_CFLAGS:=
 TARGET_LDFLAGS+=	-latomic
 CONFIG_STYLE:=		manual
 

+ 39 - 13
package/quickjs/patches/patch-Makefile

@@ -1,15 +1,6 @@
---- quickjs-2024-01-13.orig/Makefile	2024-01-13 11:20:39.000000000 +0100
-+++ quickjs-2024-01-13/Makefile	2025-03-31 22:09:50.810771963 +0200
-@@ -28,7 +28,7 @@ endif
- # Windows cross compilation from Linux
- #CONFIG_WIN32=y
- # use link time optimization (smaller and faster executables but slower build)
--CONFIG_LTO=y
-+#CONFIG_LTO=y
- # consider warnings as errors (for development)
- #CONFIG_WERROR=y
- # force 32 bit build for some utilities
-@@ -37,7 +37,7 @@ CONFIG_LTO=y
+--- quickjs-2026-06-04.orig/Makefile	2026-06-04 14:26:08.000000000 +0200
++++ quickjs-2026-06-04/Makefile	2026-08-06 00:30:06.002410151 +0200
+@@ -43,7 +43,7 @@ endif
  #CONFIG_COSMO=y
  
  # installation directory
@@ -18,7 +9,15 @@
  
  # use the gprof profiler
  #CONFIG_PROFILE=y
-@@ -217,7 +217,7 @@ ifneq ($(CROSS_PREFIX),)
+@@ -164,6 +164,7 @@ endif
+ endif
+ 
+ CFLAGS+=$(DEFINES)
++HOST_CFLAGS+=$(DEFINES)
+ CFLAGS_DEBUG=$(CFLAGS) -O0
+ CFLAGS_SMALL=$(CFLAGS) -Os
+ CFLAGS_OPT=$(CFLAGS) -O2
+@@ -287,7 +288,7 @@ ifneq ($(CROSS_PREFIX),)
  
  $(QJSC): $(OBJDIR)/qjsc.host.o \
      $(patsubst %.o, %.host.o, $(QJS_LIB_OBJS))
@@ -27,3 +26,30 @@
  
  endif #CROSS_PREFIX
  
+@@ -298,7 +299,7 @@ endif
+ QJSC_HOST_DEFINES:=-DCONFIG_CC=\"$(HOST_CC)\" -DCONFIG_PREFIX=\"$(PREFIX)\"
+ 
+ $(OBJDIR)/qjsc.o: CFLAGS+=$(QJSC_DEFINES)
+-$(OBJDIR)/qjsc.host.o: CFLAGS+=$(QJSC_HOST_DEFINES)
++$(OBJDIR)/qjsc.host.o: HOST_CFLAGS+=$(QJSC_HOST_DEFINES)
+ 
+ ifdef CONFIG_LTO
+ LTOEXT=.lto
+@@ -342,7 +343,7 @@ $(OBJDIR)/fuzz_%.o: fuzz/fuzz_%.c | $(OB
+ 	$(CC) $(CFLAGS_OPT) -c -I. -o $@ $<
+ 
+ $(OBJDIR)/%.host.o: %.c | $(OBJDIR)
+-	$(HOST_CC) $(CFLAGS_OPT) -c -o $@ $<
++	$(HOST_CC) $(HOST_CFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.pic.o: %.c | $(OBJDIR)
+ 	$(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
+@@ -363,7 +364,7 @@ regexp_test: libregexp.c libunicode.c cu
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ libregexp.c libunicode.c cutils.c $(LIBS)
+ 
+ unicode_gen: $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o libunicode.c unicode_gen_def.h
+-	$(HOST_CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
++	$(HOST_CC) $(HOST_LDFLAGS) $(HOST_CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
+ 
+ clean:
+ 	rm -f repl.c out.c