[PR PATCH] dash: add subpackage with libedit support

[PR PATCH] dash: add subpackage with libedit support

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dash-libedit
https://github.com/void-linux/void-packages/pull/47564

dash: add subpackage with libedit support
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #47408 
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47564.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dash-libedit-47564.patch --]
[-- Type: text/x-diff, Size: 2212 bytes --]

From 3c4871a84be21597b153133dfee0f7b8b4c21300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
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..f6a17ba549fdd 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 <gottox@voidlinux.org>"
 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}"
+	conflicts="dash-${version}_${revision}"
+	pkg_install() {
+		make -C build-libedit ${makejobs} install DESTDIR=${PKGDESTDIR}
+		vlicense COPYING
+	}
+ }

Re: dash: add subpackage with libedit support

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/47564#issuecomment-1839064553

Comment:
should probably `replaces=dash>=0` instead of conflicts.

Re: [PR PATCH] [Updated] dash: add subpackage with libedit support

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dash-libedit
https://github.com/void-linux/void-packages/pull/47564

dash: add subpackage with libedit support
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #47408 
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47564.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dash-libedit-47564.patch --]
[-- Type: text/x-diff, Size: 2191 bytes --]

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?=
 <congdanhqx@gmail.com>
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 <gottox@voidlinux.org>"
 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
+	}
+ }

Re: [PR PATCH] [Merged]: dash: add subpackage with libedit support

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

There's a merged pull request on the void-packages repository

dash: add subpackage with libedit support
https://github.com/void-linux/void-packages/pull/47564

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #47408 
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->