- updated to 1.2.0

- updated shared patch (dropped use of libtool; use upstream shared lib support, just add soname)

diff --git a/mujs-shared.patch b/mujs-shared.patch
index 813c30ccbfce32069fd41a96736e9e81d1d8c959..4b9480d5ed845421caa72f0787f183e4167e2455 100644 (file)
--- a/mujs-shared.patch
+++ b/mujs-shared.patch
@@ -1,62 +1,30 @@
---- mujs-1.1.3/Makefile.orig   2021-06-08 13:41:51.000000000 +0200
-+++ mujs-1.1.3/Makefile        2021-07-16 21:24:29.059361193 +0200
-@@ -18,6 +18,8 @@ endif
- # Compiler flags for various configurations:
+--- 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
  
- CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+LTCC = libtool --mode=compile --tag=CC $(CC)
-+LTLINK = libtool --mode=link --tag=CC $(CC)
- 
- ifeq "$(CC)" "clang"
-   CFLAGS += -Wunreachable-code
-@@ -55,7 +57,7 @@ HDRS := $(wildcard js*.h mujs.h utf.h re
- default: shell
- shell: $(OUT)/mujs $(OUT)/mujs-pp
- static: $(OUT)/libmujs.a
--shared: $(OUT)/libmujs.so
-+shared: $(OUT)/libmujs.la
- 
- astnames.h: jsparse.h
-       grep -E '(AST|EXP|STM)_' jsparse.h | sed 's/^[^A-Z]*\(AST_\)*/"/;s/,.*/",/' | tr A-Z a-z > $@
-@@ -80,17 +82,19 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
-       @ mkdir -p $(dir $@)
-       $(AR) cr $@ $^
- 
--$(OUT)/libmujs.so: one.c $(HDRS)
-+$(OUT)/libmujs.lo: one.c $(HDRS)
+ $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
        @ mkdir -p $(dir $@)
 -      $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
-+      $(LTCC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
++      $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -Wl,-soname,libmujs.so.0 -o $@ $< -lm
  
 -$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
--      @ mkdir -p $(dir $@)
--      $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
-+$(OUT)/libmujs.la: $(OUT)/libmujs.lo
-+      $(LTLINK) $(LDFLAGS) -o $@ $^ -rpath $(libdir) -lm
-+
-+$(OUT)/mujs: $(OUT)/libmujs.la $(OUT)/main.o
-+      $(LTLINK) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
++$(OUT)/mujs: $(OUT)/main.o $(OUT)/libmujs.$(SO_EXT)
+       @ mkdir -p $(dir $@)
+       $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
  
 -$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
-+$(OUT)/mujs-pp: $(OUT)/libmujs.la $(OUT)/pp.o
++$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/libmujs.$(SO_EXT)
        @ mkdir -p $(dir $@)
--      $(CC) $(LDFLAGS) -o $@ $^ -lm
-+      $(LTLINK) $(LDFLAGS) -o $@ $^ -lm
+       $(CC) $(LDFLAGS) -o $@ $^ -lm
  
- .PHONY: $(OUT)/mujs.pc
- $(OUT)/mujs.pc:
-@@ -117,10 +121,11 @@ install-common: $(OUT)/mujs $(OUT)/mujs.
- install-static: install-common $(OUT)/libmujs.a
+@@ -124,7 +124,9 @@ install-static: install-common $(OUT)/li
        install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
  
--install-shared: install-common $(OUT)/libmujs.so
--      install -m 755 $(OUT)/libmujs.so $(DESTDIR)$(libdir)
-+install-shared: install-common $(OUT)/libmujs.la
-+      libtool --mode=install install $(OUT)/libmujs.la $(DESTDIR)$(libdir)
-+      libtool --mode=install install $(OUT)/mujs $(DESTDIR)$(bindir)
+ install-shared: install-common $(OUT)/libmujs.$(SO_EXT)
+-      install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir)
++      install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir)/libmujs.so.0.0.0
++      ln -s libmujs.so.0.0.0 $(DESTDIR)$(libdir)/libmujs.so.0
++      ln -s libmujs.so.0.0.0 $(DESTDIR)$(libdir)/libmujs.so
  
--install: install-static
-+install: install-shared
+ install: install-static
  
- uninstall:
-       rm -f $(DESTDIR)$(bindir)/mujs

diff --git a/mujs.spec b/mujs.spec
index 640e5e2f592689b9554b809aa1847b8058b7ae80..16df5ea5dbccb2c7ca575e1b5873cb84552de7d1 100644 (file)
--- 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.1.3
+Version:       1.2.0
 Release:       1
 License:       ISC
 Group:         Development/Languages
 Source0:       https://www.mujs.com/downloads/%{name}-%{version}.tar.xz
-# Source0-md5: 509fe19edc13f2173f1d05e1a922c237
+# Source0-md5: e48906891795bb0770d5b1fa52aeded9
 Patch0:                %{name}-shared.patch
 URL:           http://www.mujs.com/
 BuildRequires: tar >= 1:1.22
@@ -50,7 +50,7 @@ Statyczna biblioteka MuJS.
 %patch0 -p1
 
 %build
-%{__make} \
+%{__make} -j1 default shared static \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} %{rpmcppflags} -std=c99 -Wall -Wextra -Wno-unused-parameter -Wunreachable-code" \
        LDFLAGS="%{rpmldflags}" \
@@ -59,13 +59,11 @@ Statyczna biblioteka MuJS.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} install install-shared \
        DESTDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix} \
        libdir=%{_libdir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmujs.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT