[gentoo-commits] repo/proj/guru:dev commit in: eclass/

[Anna Vyalkova]

commit:     2946a0ea45c40df19cf06c128ebdba892df4404e
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Nov  9 07:32:49 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Nov  9 07:32:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2946a0ea

crystal-utils.eclass: introduce mycrystalargs

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 eclass/crystal-utils.eclass | 19 +++++++++++++++++++
 eclass/shards.eclass        |  2 --
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/eclass/crystal-utils.eclass b/eclass/crystal-utils.eclass
index cb67682a6..8f8df3cc3 100644
--- a/eclass/crystal-utils.eclass
+++ b/eclass/crystal-utils.eclass
@@ -61,7 +61,19 @@ _crystal_get_debug_opt() {
 # @DESCRIPTION:
 # Set Crystal environment variables to match user settings.
 #
+# Passes arguments to Crystal by reading from an optionally pre-defined local
+# mycrystalargs bash array.
+#
 # Must be run or ecrystal/eshards will fail.
+#
+# @CODE
+# src_configure() {
+#       local mycrystalargs=(
+#               -Dfoo
+#       )
+#       crystal_configure
+# }
+# @CODE
 crystal_configure() {
        debug-print-function ${FUNCNAME} "${@}"
 
@@ -69,6 +81,12 @@ crystal_configure() {
        export CRYSTAL_CACHE_DIR="${T}/crystal"
        export SHARDS_CACHE_PATH="${T}/shards"
 
+       [[ -z ${mycrystalargs} ]] && local -a mycrystalargs=()
+       local mycrystalargstype=$(declare -p mycrystalargs 2>&-)
+       if [[ "${mycrystalargstype}" != "declare -a mycrystalargs="* ]]; then
+               die "mycrystalargs must be declared as array"
+       fi
+
        local args=(
                --link-flags="\"${LDFLAGS}\""
                --release
@@ -78,6 +96,7 @@ crystal_configure() {
                $(is-flagq -mcpu && echo "--mcpu=$(get-flag mcpu)")
                $(is-flagq -mcmodel && echo "--mcmodel=$(get-flag mcmodel)")
                # TODO: --mattr
+               "${mycrystalargs[@]}"
        )
 
        export CRYSTAL_OPTS="${args[@]}"

diff --git a/eclass/shards.eclass b/eclass/shards.eclass
index 95fe26226..756fdf335 100644
--- a/eclass/shards.eclass
+++ b/eclass/shards.eclass
@@ -64,7 +64,6 @@ shards_src_configure() {
 }
 
 # @FUNCTION: shards_src_compile
-# @USAGE: [<args>...]
 # @DESCRIPTION:
 # General function for building packages using Shards.
 shards_src_compile() {
@@ -73,7 +72,6 @@ shards_src_compile() {
        local build_args=(
                --threads=$(makeopts_jobs)
                --verbose
-               "${@}"
        )
 
        if gshards-has-targets; then