Skip to content

Commit ebbdf61

Browse files
fix(main/mujs): condense build.sh
- See termux/termux-packages#26862 (comment) - Prefer `$CPPFLAGS` over explicit `-I$TERMUX_PREFIX/include` - Prefer `TERMUX_PKG_EXTRA_MAKE_ARGS` over explicit `termux_step_make()` - Fix `Makefile` to respect environment `CFLAGS` and `prefix`
1 parent 7816d11 commit ebbdf61

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

packages/mujs/build.sh

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,14 @@ TERMUX_PKG_DESCRIPTION="A lightweight Javascript interpreter designed for embedd
33
TERMUX_PKG_LICENSE="ISC"
44
TERMUX_PKG_MAINTAINER="@termux"
55
TERMUX_PKG_VERSION=1.3.7
6+
TERMUX_PKG_REVISION=1
67
TERMUX_PKG_SRCURL=https://codeberg.org/ccxvii/mujs/archive/${TERMUX_PKG_VERSION}.tar.gz
78
TERMUX_PKG_SHA256=5701ac8314d7cb9c792d620c066d93682a74c43f2a49a8966014de05afec5d6a
89
TERMUX_PKG_AUTO_UPDATE=true
910
TERMUX_PKG_DEPENDS="readline"
1011
TERMUX_PKG_BUILD_IN_SRC=true
12+
TERMUX_PKG_EXTRA_MAKE_ARGS="HAVE_READLINE=yes"
1113

1214
termux_step_pre_configure() {
13-
CFLAGS+=" -I$TERMUX_PREFIX/include"
14-
LDFLAGS+=" -L$TERMUX_PREFIX/lib"
15-
}
16-
17-
termux_step_make() {
18-
make release \
19-
prefix=$TERMUX_PREFIX \
20-
HAVE_READLINE=yes \
21-
CC="$CC" \
22-
CFLAGS="$CFLAGS $CPPFLAGS" \
23-
LDFLAGS="$LDFLAGS"
24-
}
25-
26-
termux_step_make_install() {
27-
make install prefix=$TERMUX_PREFIX
15+
CFLAGS+=" $CPPFLAGS"
2816
}

packages/mujs/ldflags.patch

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
11
--- a/Makefile
22
+++ b/Makefile
3-
@@ -109,7 +109,7 @@ build/release/libmujs.a: build/release/libmujs.o
4-
$(AR) cr $@ $^
5-
build/release/mujs: main.c build/release/libmujs.o
6-
- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm $(READLINE_CFLAGS) $(READLINE_LIBS)
7-
+ $(CC) $(CFLAGS) $(OPTIM) $(LDFLAGS) -o $@ $^ -lm $(READLINE_CFLAGS) $(READLINE_LIBS)
8-
build/release/mujs-pp: pp.c build/release/libmujs.o
9-
$(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm
3+
@@ -4,11 +4,11 @@
104

5+
default: build/debug/mujs build/debug/mujs-pp
6+
7+
-CFLAGS = -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
8+
+CFLAGS ?= -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
9+
10+
OPTIM = -O3
11+
12+
-prefix = /usr/local
13+
+prefix ?= /usr/local
14+
bindir = $(prefix)/bin
15+
incdir = $(prefix)/include
16+
libdir = $(prefix)/lib
17+
@@ -33,7 +33,7 @@ HDRS = mujs.h jsi.h regexp.h utf.h astnames.h opnames.h utfdata.h
18+
19+
ifneq ($(HAVE_READLINE),no)
20+
READLINE_CFLAGS = -DHAVE_READLINE
21+
- READLINE_LIBS = -lreadline
22+
+ READLINE_LIBS = $(LDFLAGS) -lreadline
23+
endif
24+
25+
SRCS = \

0 commit comments

Comments
 (0)