* [gentoo-dev] [PATCH v2] eclass/dune.eclass: fixes
@ 2021-12-09 22:10 Maciej Barć
2021-12-09 22:29 ` Sam James
0 siblings, 1 reply; 3+ messages in thread
From: Maciej Barć @ 2021-12-09 22:10 UTC (permalink / raw
To: gentoo-dev; +Cc: ml, Maciej Barć
bump to EAPI 8
drop support for EAPI 5
set DUNE_PKG_NAME to PN by default
move "Move docs to the appropriate place" block to dune-install
to make dune-install now handle a list of subpackages correctly
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
eclass/dune.eclass | 50 ++++++++++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 19 deletions(-)
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 02a8a870e..8cf8ededa 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -8,7 +8,7 @@
# ML <ml@gentoo.org>
# @AUTHOR:
# Rafael Kitover <rkitover@gmail.com>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Provides functions for installing Dune packages.
# @DESCRIPTION:
# Provides dependencies on dDne and OCaml and default src_compile, src_test and
@@ -19,9 +19,10 @@
# @DESCRIPTION:
# Sets the actual Dune package name, if different from Gentoo package name.
# Set before inheriting the eclass.
+: ${DUNE_PKG_NAME:-${PN}}
case ${EAPI:-0} in
- 5|6|7) ;;
+ 6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
esac
@@ -32,7 +33,7 @@ EXPORT_FUNCTIONS src_compile src_test src_install
RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:="
case ${EAPI:-0} in
- 5|6)
+ 6)
DEPEND="${RDEPEND} dev-ml/dune"
;;
*)
@@ -54,26 +55,37 @@ dune_src_test() {
# @DESCRIPTION:
# Installs the dune packages given as arguments. For each "${pkg}" element in
# that list, "${pkg}.install" must be readable from "${PWD}/_build/default"
+#
+# Example use:
+# @CODE
+# dune-install menhir menhirLib menhirSdk
+# @CODE
dune-install() {
+ local pkgs
+ if [[ -n "${@}" ]] ; then
+ pkgs="${@}"
+ else
+ pkgs=${DUNE_PKG_NAME}
+ fi
+
+ local myduneopts=(
+ --prefix="${ED%/}/usr"
+ --libdir="${D%/}$(ocamlc -where)"
+ --mandir="${ED%/}/usr/share/man"
+ )
local pkg
- for pkg ; do
- dune install \
- --prefix="${ED%/}/usr" \
- --libdir="${D%/}$(ocamlc -where)" \
- --mandir="${ED%/}/usr/share/man" \
- "${pkg}" || die
+ for pkg in ${pkgs[@]} ; do
+ dune install ${myduneopts[@]} ${pkg} || die
+
+ # Move docs to the appropriate place.
+ if [ -d "${ED%/}/usr/doc/${pkg}" ] ; then
+ mkdir -p "${ED%/}/usr/share/doc/${PF}/" || die
+ mv "${ED%/}/usr/doc/${pkg}" "${ED%/}/usr/share/doc/${PF}/" || die
+ rm -rf "${ED%/}/usr/doc" || die
+ fi
done
}
dune_src_install() {
- local pkg="${1:-${DUNE_PKG_NAME:-${PN}}}"
-
- dune-install "${pkg}"
-
- # Move docs to the appropriate place.
- if [ -d "${ED%/}/usr/doc/${pkg}" ] ; then
- mkdir -p "${ED%/}/usr/share/doc/${PF}/" || die
- mv "${ED%/}/usr/doc/${pkg}/"* "${ED%/}/usr/share/doc/${PF}/" || die
- rm -rf "${ED%/}/usr/doc" || die
- fi
+ dune-install ${1:-${DUNE_PKG_NAME}}
}
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [gentoo-dev] [PATCH v2] eclass/dune.eclass: fixes
2021-12-09 22:10 [gentoo-dev] [PATCH v2] eclass/dune.eclass: fixes Maciej Barć
@ 2021-12-09 22:29 ` Sam James
2021-12-09 22:32 ` Maciej Barć
0 siblings, 1 reply; 3+ messages in thread
From: Sam James @ 2021-12-09 22:29 UTC (permalink / raw
To: gentoo-dev; +Cc: ml, Maciej Barć
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
> On 9 Dec 2021, at 22:10, Maciej Barć <xgqt@gentoo.org> wrote:
>
> bump to EAPI 8
Say "support EAPI 8" instead.
May be worth splitting the commit into a few different changes
so the summary can be more informative than "fixes"
(try git add -p).
lgtm otherwise, thanks for doing this!
> drop support for EAPI 5
> set DUNE_PKG_NAME to PN by default
> move "Move docs to the appropriate place" block to dune-install
> to make dune-install now handle a list of subpackages correctly
>
> Signed-off-by: Maciej Barć <xgqt@gentoo.org>
> ---
> eclass/dune.eclass | 50 ++++++++++++++++++++++++++++------------------
> 1 file changed, 31 insertions(+), 19 deletions(-)
> [snip]
Best,
sam
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [gentoo-dev] [PATCH v2] eclass/dune.eclass: fixes
2021-12-09 22:29 ` Sam James
@ 2021-12-09 22:32 ` Maciej Barć
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2021-12-09 22:32 UTC (permalink / raw
To: gentoo-dev, Sam James; +Cc: ml
[-- Attachment #1.1.1: Type: text/plain, Size: 1096 bytes --]
> May be worth splitting the commit into a few different changes
> so the summary can be more informative than "fixes"
> (try git add -p).
Actually the more accurate summary would be "fix dune-install function".
I wouldn't split it imo.
On 12/9/21 23:29, Sam James wrote:
>
>
>> On 9 Dec 2021, at 22:10, Maciej Barć <xgqt@gentoo.org> wrote:
>>
>> bump to EAPI 8
>
> Say "support EAPI 8" instead.
>
> May be worth splitting the commit into a few different changes
> so the summary can be more informative than "fixes"
> (try git add -p).
>
> lgtm otherwise, thanks for doing this!
>
>> drop support for EAPI 5
>> set DUNE_PKG_NAME to PN by default
>> move "Move docs to the appropriate place" block to dune-install
>> to make dune-install now handle a list of subpackages correctly
>>
>> Signed-off-by: Maciej Barć <xgqt@gentoo.org>
>> ---
>> eclass/dune.eclass | 50 ++++++++++++++++++++++++++++------------------
>> 1 file changed, 31 insertions(+), 19 deletions(-)
>> [snip]
>
> Best,
> sam
>
--
Have a great day!
~ Maciej XGQT Barć
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 6295 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-09 22:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-09 22:10 [gentoo-dev] [PATCH v2] eclass/dune.eclass: fixes Maciej Barć
2021-12-09 22:29 ` Sam James
2021-12-09 22:32 ` Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox