mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-19 12:03:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

crystal-utils.eclass: introduce mycrystalargs

Browse Source 
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
This commit is contained in:
Anna (cybertailor) Vyalkova
2022-11-09 12:32:49 +05:00
parent b7ffda32dc
commit 2946a0ea45
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
eclass/crystal-utils.eclass
View File

@@ -61,7 +61,19 @@ _crystal_get_debug_opt() {
# @DESCRIPTION: # @DESCRIPTION:
# Set Crystal environment variables to match user settings. # 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. # Must be run or ecrystal/eshards will fail.
#
# @CODE
# src_configure() {
# local mycrystalargs=(
# -Dfoo
# )
# crystal_configure
# }
# @CODE
crystal_configure() { crystal_configure() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
@@ -69,6 +81,12 @@ crystal_configure() {
export CRYSTAL_CACHE_DIR="${T}/crystal" export CRYSTAL_CACHE_DIR="${T}/crystal"
export SHARDS_CACHE_PATH="${T}/shards" 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=( local args=(
--link-flags="\"${LDFLAGS}\"" --link-flags="\"${LDFLAGS}\""
--release --release
@@ -78,6 +96,7 @@ crystal_configure() {
$(is-flagq -mcpu && echo "--mcpu=$(get-flag mcpu)") $(is-flagq -mcpu && echo "--mcpu=$(get-flag mcpu)")
$(is-flagq -mcmodel && echo "--mcmodel=$(get-flag mcmodel)") $(is-flagq -mcmodel && echo "--mcmodel=$(get-flag mcmodel)")
# TODO: --mattr # TODO: --mattr
"${mycrystalargs[@]}"
) )
export CRYSTAL_OPTS="${args[@]}" export CRYSTAL_OPTS="${args[@]}"

2
eclass/shards.eclass
View File

@@ -64,7 +64,6 @@ shards_src_configure() {
} }
# @FUNCTION: shards_src_compile # @FUNCTION: shards_src_compile
# @USAGE: [<args>...]
# @DESCRIPTION: # @DESCRIPTION:
# General function for building packages using Shards. # General function for building packages using Shards.
shards_src_compile() { shards_src_compile() {
@@ -73,7 +72,6 @@ shards_src_compile() {
local build_args=( local build_args=(
--threads=$(makeopts_jobs) --threads=$(makeopts_jobs)
--verbose --verbose
"${@}"
) )
if gshards-has-targets; then if gshards-has-targets; then