commit d0022076ab83d12082432df4e692ce14faffe776
Author: Witold Filipczyk <[email protected]>
Date: Mon Oct 7 18:58:54 2024 +0200
- updated to 2024-01-13
q.diff | 13 -------------
quickjs.spec | 12 +++++-------
rpmpldcflags.patch | 12 ++++++------
3 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/quickjs.spec b/quickjs.spec
index 476b2c5..867a0ec 100644
--- a/quickjs.spec
+++ b/quickjs.spec
@@ -1,15 +1,14 @@
-%define ver 2023-12-09
+%define ver 2024-01-13
Summary: QuickJS Javascript Engine
Summary(pl.UTF-8): Silnik Javascriptu QuickJS
Name: quickjs
-Version: 20231209
+Version: 20240113
Release: 1
License: MIT
Group: Libraries
Source0: https://bellard.org/quickjs/%{name}-%{ver}.tar.xz
-# Source0-md5: c8d37b54826a11b893c3f5357636ee7d
+# Source0-md5: ea9fa8c503c4125dff9fd42c38b891d0
Patch0: rpmpldcflags.patch
-Patch1: q.diff
URL: https://bellard.org/quickjs/
%ifnarch %arch_with_atomics64
BuildRequires: libatomic-devel
@@ -48,7 +47,6 @@ Pliki nagłówkowe biblioteki QuickJS.
%prep
%setup -q -n %{name}-%{ver}
%patch0 -p1
-%patch1 -p1
%build
%{__make} \
@@ -58,7 +56,7 @@ Pliki nagłówkowe biblioteki QuickJS.
%ifnarch %arch_with_atomics64
EXTRA_LIBS="-latomic" \
%endif
- prefix="%{_prefix}"
+ PREFIX="%{_prefix}"
%install
rm -rf $RPM_BUILD_ROOT
@@ -67,7 +65,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
STRIP=true \
- prefix="%{_prefix}"
+ PREFIX="%{_prefix}"
%if "%{_lib}" != "lib"
%{__mv} $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}}/%{name}
diff --git a/q.diff b/q.diff
deleted file mode 100644
index 363f1a7..0000000
--- a/q.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/quickjs.c b/quickjs.c
-index c3f98e2e0..3b59284e6 100644
---- a/quickjs.c
-+++ b/quickjs.c
-@@ -7858,6 +7858,8 @@ static JSValue JS_GetPropertyValue(JSContext *ctx,
JSValueConst this_obj,
- uint32_t idx, len;
- /* fast path for array access */
- p = JS_VALUE_GET_OBJ(this_obj);
-+ if (unlikely(!p->fast_array))
-+ goto slow_path;
- idx = JS_VALUE_GET_INT(prop);
- len = (uint32_t)p->u.array.count;
- if (unlikely(idx >= len))
diff --git a/rpmpldcflags.patch b/rpmpldcflags.patch
index 4b2d596..681cf91 100644
--- a/rpmpldcflags.patch
+++ b/rpmpldcflags.patch
@@ -1,12 +1,12 @@
-diff -up quickjs-2021-03-27/Makefile.orig quickjs-2021-03-27/Makefile
---- quickjs-2021-03-27/Makefile.orig 2021-03-27 11:00:32.000000000 +0100
-+++ quickjs-2021-03-27/Makefile 2021-10-09 19:52:07.936499497 +0200
-@@ -110,7 +110,7 @@ endif
+diff -up quickjs-2024-01-13/Makefile.orig quickjs-2024-01-13/Makefile
+--- quickjs-2024-01-13/Makefile.orig 2024-10-07 18:37:31.935011886 +0200
++++ quickjs-2024-01-13/Makefile 2024-10-07 18:38:45.730310335 +0200
+@@ -122,7 +122,7 @@ endif
CFLAGS+=$(DEFINES)
CFLAGS_DEBUG=$(CFLAGS) -O0
CFLAGS_SMALL=$(CFLAGS) -Os
-CFLAGS_OPT=$(CFLAGS) -O2
+CFLAGS_OPT=$(CFLAGS) -O2 $(RPMPLDCFLAGS)
CFLAGS_NOLTO:=$(CFLAGS_OPT)
- LDFLAGS=-g
- ifdef CONFIG_LTO
+ ifdef CONFIG_COSMO
+ LDFLAGS+=-s # better to strip by default
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/quickjs.git/commitdiff/d0022076ab83d12082432df4e692ce14faffe776
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
