From 6a8607f171af1a06d2a9e9b0429e1e2638e71bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Dec 2023 20:36:17 +0700 Subject: [PATCH] dash: add subpackage with libedit support --- srcpkgs/dash-libedit | 1 + srcpkgs/dash/template | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/dash-libedit diff --git a/srcpkgs/dash-libedit b/srcpkgs/dash-libedit new file mode 120000 index 0000000000000..7e03e4f627dbc --- /dev/null +++ b/srcpkgs/dash-libedit @@ -0,0 +1 @@ +dash \ No newline at end of file diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template index 7ab7edeacd5f3..04db89b8a9bb5 100644 --- a/srcpkgs/dash/template +++ b/srcpkgs/dash/template @@ -1,10 +1,10 @@ # Template file for 'dash' pkgname=dash version=0.5.12 -revision=1 +revision=2 build_style=gnu-configure -configure_args="$(vopt_enable static)" hostmakedepends="bison" +makedepends="libedit-devel" short_desc="POSIX-compliant Unix shell, much smaller than GNU bash" maintainer="Enno Boland " license="BSD-3-Clause" @@ -19,6 +19,39 @@ alternatives=" build_options="static" -post_install() { - vlicense COPYING +do_configure() { + mkdir -p build-minimal build-libedit + cd ${wrksrc}/build-minimal + ../configure ${configure_args} $(vopt_enable static) --without-libedit + cd ${wrksrc}/build-libedit + ../configure ${configure_args} --with-libedit } + +do_build() { + make -C build-minimal ${makejobs} + make -C build-libedit ${makejobs} +} + +do_check() { + make -C build-minimal ${makejobs} check + make -C build-libedit ${makejobs} check +} + +do_install() { + make -C build-minimal ${makejobs} install DESTDIR=${DESTDIR} + vlicense COPYING +} + +dash-libedit_package() { + short_desc+=" - with libedit" + register_shell="/usr/bin/sh /usr/bin/dash /bin/sh /bin/dash" + alternatives=" + sh:sh:/usr/bin/dash + sh:sh.1:/usr/share/man/man1/dash.1" + provides="dash-${version}_${revision}" + replaces="dash>=0" + pkg_install() { + make -C build-libedit ${makejobs} install DESTDIR=${PKGDESTDIR} + vlicense COPYING + } + }