From f54ce75e2f709dddff93f51c30f8c827b179c24d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Sep 2022 00:41:12 +0200 Subject: [PATCH] mujs: add and use shared library, add mujs-devel. --- common/shlibs | 1 + srcpkgs/mujs/patches/dynlink.patch | 25 +++++++++++++++++++++++++ srcpkgs/mujs/template | 20 ++++++++++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/mujs/patches/dynlink.patch diff --git a/common/shlibs b/common/shlibs index 9833aabef14..d67706da08e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4161,3 +4161,4 @@ libglibutil.so.1 libglibutil-1.0.64_1 libgbinder.so.1 libgbinder-1.1.20_1 libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1 +libmujs.1.2.0 libmujs-1.2.0_2 diff --git a/srcpkgs/mujs/patches/dynlink.patch b/srcpkgs/mujs/patches/dynlink.patch new file mode 100644 index 00000000000..44c06025788 --- /dev/null +++ b/srcpkgs/mujs/patches/dynlink.patch @@ -0,0 +1,25 @@ +Dynamically link the shell against libmujs.so + +--- a/Makefile ++++ b/Makefile +@@ -88,7 +88,7 @@ + + $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS) + @ mkdir -p $(dir $@) +- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm ++ $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -Wl,-soname=libmujs.so.$(VERSION) $(LDFLAGS) -o $@ $< -lm + + $(OUT)/mujs: $(OUT)/libmujs.so $(OUT)/main.o + @ mkdir -p $(dir $@) +@@ -90,9 +90,9 @@ + @ mkdir -p $(dir $@) + $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm + +-$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o ++$(OUT)/mujs: $(OUT)/libmujs.so $(OUT)/main.o + @ mkdir -p $(dir $@) +- $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm ++ $(CC) $(LDFLAGS) -o $@ $(OUT)/main.o -L $(OUT) $(LIBREADLINE) -lmujs -lm + + $(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o + @ mkdir -p $(dir $@) diff --git a/srcpkgs/mujs/template b/srcpkgs/mujs/template index 7ee43a2f4c3..6cbed6823d1 100644 --- a/srcpkgs/mujs/template +++ b/srcpkgs/mujs/template @@ -1,8 +1,10 @@ # Template file for 'mujs' pkgname=mujs version=1.2.0 -revision=1 +revision=2 build_style=gnu-makefile +make_build_args="shell shared" +make_install_args="prefix=/usr install-static install-shared" makedepends="readline-devel" short_desc="Embeddable JavaScript interpreter written in C" maintainer="dkwo " @@ -10,8 +12,22 @@ license="ISC" homepage="https://mujs.com/" distfiles="https://github.com/ccxvii/mujs/archive/refs/tags/${version}.tar.gz" checksum=bbb74b96c168e7120f1aa2ce0a42026eba01cff14a9234108c91795f3a4c8cd0 -make_install_args+=" prefix=/usr" + +CFLAGS="-DHAVE_READLINE" post_install() { + mv ${DESTDIR}/usr/lib/libmujs.so ${DESTDIR}/usr/lib/libmujs.so.${version} + ln -s libmujs.so.${version} ${DESTDIR}/usr/lib/libmujs.so vlicense COPYING } + +mujs-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/*.so + vmove usr/lib/pkgconfig + } +}