commit 11970465c2d7870e4b3c507764c4fef2980aa5f5
Author: Jakub Bogusz <[email protected]>
Date: Thu Apr 14 21:30:09 2016 +0200
- updated to latest snap (last change on 20160301)
- updated shared patch
mujs-shared.patch | 32 ++++++++++++++++----------------
mujs.spec | 6 +++---
2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/mujs.spec b/mujs.spec
index 49c6404..b729ad4 100644
--- a/mujs.spec
+++ b/mujs.spec
@@ -2,14 +2,14 @@ Summary: MuJS - lightweight, embeddable JavaScript
interpreter in C
Summary(pl.UTF-8): MuJS - lekki, osadzalny interpreter JavaScriptu
napisany w C
Name: mujs
Version: 0
-%define snap 20141118
-Release: 0.%{snap}.2
+%define snap 20160302
+Release: 0.%{snap}.1
License: AGPL v3+
Group: Development/Languages
# git clone git://git.ghostscript.com/mujs.git
# tar cJf mujs.tar.xz mujs
Source0: %{name}.tar.xz
-# Source0-md5: 36b3cce9191c6788ab72dd72e97d6f72
+# Source0-md5: 9ef58e75f0cc240141ca8b51d6909aad
Patch0: %{name}-shared.patch
URL: http://www.mujs.com/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/mujs-shared.patch b/mujs-shared.patch
index 1881366..0a9fef9 100644
--- a/mujs-shared.patch
+++ b/mujs-shared.patch
@@ -1,28 +1,28 @@
---- mujs/Makefile.orig 2014-11-29 10:26:09.000000000 +0100
-+++ mujs/Makefile 2014-11-29 18:04:50.775023210 +0100
+--- mujs/Makefile.orig 2016-04-14 21:02:05.000000000 +0200
++++ mujs/Makefile 2016-04-14 21:20:51.139270570 +0200
@@ -1,6 +1,6 @@
- SRCS := $(wildcard js*.c utf*.c regex.c)
- HDRS := $(wildcard js*.h mujs.h utf.h regex.h)
+ SRCS := $(wildcard js*.c utf*.c regexp.c)
+ HDRS := $(wildcard js*.h mujs.h utf.h regexp.h)
-OBJS := $(SRCS:%.c=build/%.o)
-+LOBJS := $(SRCS:%.c=build/%.lo)
++LOBJS := $(SRCS:%.c=build/%.o)
prefix ?= /usr/local
bindir ?= $(prefix)/bin
-@@ -9,6 +9,8 @@
+@@ -8,6 +8,8 @@
+ libdir ?= $(prefix)/lib
- CC := clang
- CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-Wunreachable-code
+ CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
+LTCC = libtool --mode=compile --tag=CC $(CC)
+LTLINK = libtool --mode=link --tag=CC $(CC)
- ifeq "$(build)" "debug"
- CFLAGS += -g
-@@ -41,11 +43,14 @@
+ ifeq "$(CC)" "clang"
+ CFLAGS += -Wunreachable-code
+@@ -44,11 +46,14 @@
build/%.o: %.c $(HDRS)
$(CC) $(CFLAGS) -o $@ -c $<
-build/libmujs.a: $(OBJS)
-- ar cru $@ $^
+- $(AR) cru $@ $^
+build/%.lo: %.c $(HDRS)
+ $(LTCC) $(CFLAGS) -o $@ -c $<
@@ -36,12 +36,12 @@
build/mujsone: build/main.o build/one.o
$(CC) $(LDFLAGS) -o $@ $^ -lm
-@@ -55,8 +60,8 @@
+@@ -58,8 +63,8 @@
install -d $(DESTDIR)$(libdir)
install -d $(DESTDIR)$(bindir)
- install -t $(DESTDIR)$(incdir) mujs.h
-- install -t $(DESTDIR)$(libdir) build/libmujs.a
-- install -t $(DESTDIR)$(bindir) build/mujs
+ install mujs.h $(DESTDIR)$(incdir)
+- install build/libmujs.a $(DESTDIR)$(libdir)
+- install build/mujs $(DESTDIR)$(bindir)
+ libtool --mode=install install build/libmujs.la $(DESTDIR)$(libdir)
+ libtool --mode=install install build/mujs $(DESTDIR)$(bindir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mujs.git/commitdiff/11970465c2d7870e4b3c507764c4fef2980aa5f5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
