commit 34ac6cd62fce74bf8dfc4d3516eb9d58169b13a7
Author: Jan Palus <[email protected]>
Date: Tue Nov 29 13:05:48 2022 +0100
up to 1.3.2
mujs-shared.patch | 18 ++++++++++--------
mujs.spec | 7 ++++---
2 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/mujs.spec b/mujs.spec
index def8d58..e6fd57e 100644
--- a/mujs.spec
+++ b/mujs.spec
@@ -1,12 +1,12 @@
Summary: MuJS - lightweight, embeddable JavaScript interpreter in C
Summary(pl.UTF-8): MuJS - lekki, osadzalny interpreter JavaScriptu
napisany w C
Name: mujs
-Version: 1.2.0
+Version: 1.3.2
Release: 1
License: ISC
Group: Development/Languages
Source0: https://www.mujs.com/downloads/%{name}-%{version}.tar.xz
-# Source0-md5: e48906891795bb0770d5b1fa52aeded9
+# Source0-md5: c2221592e7033fd32cc399e24ca44f18
Patch0: %{name}-shared.patch
URL: http://www.mujs.com/
BuildRequires: readline-devel
@@ -55,7 +55,8 @@ Statyczna biblioteka MuJS.
CC="%{__cc}" \
CFLAGS="%{rpmcflags} %{rpmcppflags} -std=c99 -Wall -Wextra
-Wno-unused-parameter -Wunreachable-code" \
LDFLAGS="%{rpmldflags}" \
- libdir=%{_libdir}
+ libdir=%{_libdir} \
+ libmujs=libmujs.so
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/mujs-shared.patch b/mujs-shared.patch
index 4b9480d..128fdf1 100644
--- a/mujs-shared.patch
+++ b/mujs-shared.patch
@@ -1,21 +1,23 @@
--- mujs-1.2.0/Makefile.orig 2021-12-08 12:56:12.000000000 +0100
+++ mujs-1.2.0/Makefile 2022-04-08 06:21:16.629112683 +0200
-@@ -88,13 +88,13 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
+@@ -88,15 +88,15 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
$(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
- @ mkdir -p $(dir $@)
+ @ mkdir -p $(@D)
- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
+ $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS)
-Wl,-soname,libmujs.so.0 -o $@ $< -lm
--$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
+ libmujs ?= libmujs.a
+
+-$(OUT)/mujs: $(OUT)/main.o $(OUT)/$(libmujs)
+$(OUT)/mujs: $(OUT)/main.o $(OUT)/libmujs.$(SO_EXT)
- @ mkdir -p $(dir $@)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
+ @ mkdir -p $(@D)
+ $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) $(LIBREADLINE) -lm
--$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
+-$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/$(libmujs)
+$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/libmujs.$(SO_EXT)
- @ mkdir -p $(dir $@)
- $(CC) $(LDFLAGS) -o $@ $^ -lm
+ @ mkdir -p $(@D)
+ $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) -lm
@@ -124,7 +124,9 @@ install-static: install-common $(OUT)/li
install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mujs.git/commitdiff/34ac6cd62fce74bf8dfc4d3516eb9d58169b13a7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
