mujs: update to 1.3.3.
Changes not found.
This commit is contained in:
parent
bf57ad7739
commit
85997f7d6c
5 changed files with 14 additions and 131 deletions
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.3 2023/01/23 15:42:08 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2023/04/24 07:50:40 wiz Exp $
|
||||
|
||||
DISTNAME= mujs-1.3.2
|
||||
DISTNAME= mujs-1.3.3
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= https://mujs.com/downloads/
|
||||
|
||||
|
@ -10,17 +10,9 @@ COMMENT= Lightweight embedded JavaScript interpreter
|
|||
LICENSE= isc
|
||||
|
||||
USE_TOOLS+= gmake
|
||||
USE_LIBTOOL= yes
|
||||
|
||||
MAKE_FLAGS+= prefix=${PREFIX}
|
||||
MAKE_FLAGS+= VERSION=${PKGVERSION_NOREV}
|
||||
MAKE_FLAGS+= HAVE_READLINE=yes
|
||||
|
||||
BUILD_TARGET= shell shared build/release/mujs.pc
|
||||
INSTALL_TARGET= install-common install-shared
|
||||
|
||||
PKGCONFIG_OVERRIDE_STAGE= pre-install
|
||||
PKGCONFIG_OVERRIDE+= build/release/mujs.pc
|
||||
BUILD_TARGET= default
|
||||
|
||||
.include "../../mk/readline.buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
@comment $NetBSD: PLIST,v 1.1 2022/08/30 12:47:02 nia Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2023/04/24 07:50:40 wiz Exp $
|
||||
bin/mujs
|
||||
bin/mujs-pp
|
||||
include/mujs.h
|
||||
lib/libmujs.la
|
||||
lib/libmujs.a
|
||||
lib/pkgconfig/mujs.pc
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.1 2022/08/30 12:47:02 nia Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.2 2023/04/24 07:50:40 wiz Exp $
|
||||
|
||||
BUILDLINK_TREE+= mujs
|
||||
|
||||
.if !defined(MUJS_BUILDLINK3_MK)
|
||||
MUJS_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.mujs+= mujs>=1.2.0
|
||||
BUILDLINK_DEPMETHOD.mujs?= build
|
||||
|
||||
BUILDLINK_API_DEPENDS.mujs+= mujs>=1.3.3
|
||||
BUILDLINK_PKGSRCDIR.mujs?= ../../lang/mujs
|
||||
.endif # MUJS_BUILDLINK3_MK
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
$NetBSD: distinfo,v 1.3 2023/01/23 15:42:08 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.4 2023/04/24 07:50:40 wiz Exp $
|
||||
|
||||
BLAKE2s (mujs-1.3.2.tar.gz) = 296cb4f45517ce8a9ab11de9beeff868dbf2776c23e22075736954047eca7dc4
|
||||
SHA512 (mujs-1.3.2.tar.gz) = ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
|
||||
Size (mujs-1.3.2.tar.gz) = 127899 bytes
|
||||
SHA1 (patch-Makefile) = d750c6a9fbafc4d47efec514f37b6a85123337b8
|
||||
BLAKE2s (mujs-1.3.3.tar.gz) = b91373ed586938084ceaa6b90545fa580ea6f7efd9fecbd84ab50189b6fca943
|
||||
SHA512 (mujs-1.3.3.tar.gz) = 74288484185473a813c55e08dcc2fefba46f87651d3a1fcea6ac843bb09a4150e13e0d46b348a34380a0defdeaa388cc93b6f7f569a7886091a34b4951b9461b
|
||||
Size (mujs-1.3.3.tar.gz) = 128097 bytes
|
||||
|
|
|
@ -1,111 +0,0 @@
|
|||
$NetBSD: patch-Makefile,v 1.3 2023/01/23 15:42:08 wiz Exp $
|
||||
|
||||
- Don't invoke git.
|
||||
- Honor user's CFLAGS/LDFLAGS.
|
||||
- libtoolize shared object creation.
|
||||
- The PHONY target is removed to allow PKGCONFIG_OVERRIDE to work.
|
||||
|
||||
--- Makefile.orig 2022-11-07 15:24:56.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -9,21 +9,11 @@ bindir ?= $(prefix)/bin
|
||||
incdir ?= $(prefix)/include
|
||||
libdir ?= $(prefix)/lib
|
||||
|
||||
-ifeq "$(wildcard .git)" ".git"
|
||||
- VERSION := $(shell git describe --tags --always)
|
||||
-else
|
||||
- VERSION := $(patsubst mujs-%,%,$(notdir $(CURDIR)))
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(shell uname),Darwin)
|
||||
- SO_EXT := dylib
|
||||
-else
|
||||
- SO_EXT := so
|
||||
-endif
|
||||
+SO_EXT := la
|
||||
|
||||
# Compiler flags for various configurations:
|
||||
|
||||
-CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
|
||||
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
|
||||
|
||||
ifeq "$(CC)" "clang"
|
||||
CFLAGS += -Wunreachable-code
|
||||
@@ -33,16 +23,6 @@ ifeq "$(shell uname)" "Linux"
|
||||
HAVE_READLINE := yes
|
||||
endif
|
||||
|
||||
-ifeq "$(build)" "debug"
|
||||
- CFLAGS += -g
|
||||
-else ifeq "$(build)" "sanitize"
|
||||
- CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
|
||||
- LDFLAGS += -fsanitize=address
|
||||
-else ifeq "$(build)" "release"
|
||||
- CFLAGS += -O2
|
||||
- LDFLAGS += -Wl,-s
|
||||
-endif
|
||||
-
|
||||
ifeq "$(HAVE_READLINE)" "yes"
|
||||
CFLAGS += -DHAVE_READLINE
|
||||
LIBREADLINE += -lreadline
|
||||
@@ -74,33 +54,32 @@ one.c: $(SRCS)
|
||||
|
||||
jsdump.c: astnames.h opnames.h
|
||||
|
||||
-$(OUT)/%.o: %.c $(HDRS)
|
||||
+$(OUT)/%.lo: %.c $(HDRS)
|
||||
@ mkdir -p $(@D)
|
||||
- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
|
||||
|
||||
-$(OUT)/libmujs.o: one.c $(HDRS)
|
||||
+$(OUT)/libmujs.lo: one.c $(HDRS)
|
||||
@ mkdir -p $(@D)
|
||||
- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
|
||||
|
||||
-$(OUT)/libmujs.a: $(OUT)/libmujs.o
|
||||
+$(OUT)/libmujs.a: $(OUT)/libmujs.lo
|
||||
@ mkdir -p $(@D)
|
||||
$(AR) cr $@ $^
|
||||
|
||||
-$(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
|
||||
+$(OUT)/libmujs.$(SO_EXT): $(OUT)/libmujs.lo one.c $(HDRS)
|
||||
@ mkdir -p $(@D)
|
||||
- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(PREFIX)/lib -o $@ $< -lm
|
||||
|
||||
libmujs ?= libmujs.a
|
||||
|
||||
-$(OUT)/mujs: $(OUT)/main.o $(OUT)/$(libmujs)
|
||||
+$(OUT)/mujs: $(OUT)/main.lo $(OUT)/libmujs.$(SO_EXT)
|
||||
@ mkdir -p $(@D)
|
||||
- $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) $(LIBREADLINE) -lm
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
|
||||
|
||||
-$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/$(libmujs)
|
||||
+$(OUT)/mujs-pp: $(OUT)/pp.lo $(OUT)/libmujs.$(SO_EXT)
|
||||
@ mkdir -p $(@D)
|
||||
- $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) -lm
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm
|
||||
|
||||
-.PHONY: $(OUT)/mujs.pc
|
||||
$(OUT)/mujs.pc:
|
||||
@ mkdir -p $(dir $@)
|
||||
@ echo Creating $@
|
||||
@@ -121,13 +100,13 @@ install-common: $(OUT)/mujs $(OUT)/mujs.
|
||||
install -d $(DESTDIR)$(bindir)
|
||||
install -m 644 mujs.h $(DESTDIR)$(incdir)
|
||||
install -m 644 $(OUT)/mujs.pc $(DESTDIR)$(libdir)/pkgconfig
|
||||
- install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir)
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=install install -m 755 $(OUT)/mujs $(DESTDIR)$(bindir)
|
||||
|
||||
install-static: install-common $(OUT)/libmujs.a
|
||||
install -m 644 $(OUT)/libmujs.a $(DESTDIR)$(libdir)
|
||||
|
||||
install-shared: install-common $(OUT)/libmujs.$(SO_EXT)
|
||||
- install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir)
|
||||
+ $(LIBTOOL) --quiet --tag=CC --mode=install install -m 755 $(OUT)/libmujs.$(SO_EXT) $(DESTDIR)$(libdir)
|
||||
|
||||
install: install-static
|
||||
|
Loading…
Reference in a new issue