gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-08 18:27:07 -08:00
Code Issues Projects Releases Wiki Activity

games-strategy/freeciv: use meson-format-array

Browse Source 
Also include logic to prevent duplicate `cli` modpack array members
built with `sdl2` and `sdl3` clients.

Signed-off-by: Matt Jolly <kangie@gentoo.org>
This commit is contained in:
Matt Jolly
2025-04-16 15:52:31 +10:00
parent 8ae0fab62d
commit c86eccf8fe
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
games-strategy/freeciv/freeciv-3.2.0_beta2.ebuild
+7 -4
View File
@@ -123,7 +123,10 @@ src_configure() {
if use ${flag} ; then
myclient+=( ${client_name} )
use modpack && myfcmp+=( ${fcmp_name} )
# Avoid duplicate `cli` entries; meson will complain
if use modpack && [[ ! " ${myfcmp[*]} " =~ " ${fcmp_name} " ]]; then
myfcmp+=( ${fcmp_name} )
fi
fi
}
@@ -145,8 +148,8 @@ src_configure() {
# the client and fpmc arrays are now populated (or not for dedicated); let's add them to emesonargs
emesonargs+=(
-Dclients=$(IFS=, ; echo "${myclient[*]}")
-Dfcmp=$(IFS=, ; echo "${myfcmp[*]}")
-Dclients="$(meson-format-array "${myclient[*]}")"
-Dfcmp="$(meson-format-array "${myfcmp[*]}")"
)
if use sound; then
@@ -171,7 +174,7 @@ src_configure() {
# default-enabled upstream
use rule-editor && tools+=( ruledit ruleup )
emesonargs+=(
-Dtools=$(IFS=, ; echo ${tools[*]})
-Dtools=$(meson-format-array ${tools[*]})
)
# Anything that can be trivially set by meson_use goes here
games-strategy/freeciv/freeciv-9999.ebuild
+8 -5
View File
@@ -131,7 +131,10 @@ src_configure() {
if use ${flag} ; then
myclient+=( ${client_name} )
use modpack && myfcmp+=( ${fcmp_name} )
# Avoid duplicate `cli` entries; meson will complain
if use modpack && [[ ! " ${myfcmp[*]} " =~ " ${fcmp_name} " ]]; then
myfcmp+=( ${fcmp_name} )
fi
fi
}
@@ -153,8 +156,8 @@ src_configure() {
# the client and fpmc arrays are now populated (or not for dedicated); let's add them to emesonargs
emesonargs+=(
-Dclients=$(IFS=, ; echo "${myclient[*]}")
-Dfcmp=$(IFS=, ; echo "${myfcmp[*]}")
-Dclients="$(meson-format-array "${myclient[*]}")"
-Dfcmp="$(meson-format-array "${myfcmp[*]}")"
)
if use authentication; then
@@ -163,7 +166,7 @@ src_configure() {
use mariadb && myfcdb+=( mariadb )
use odbc && myfcdb+=( odbc )
emesonargs+=(
-Dfcdb=$(IFS=, ; echo "${myfcdb[*]}")
-Dfcdb="$(meson-format-array "${myfcdb[*]}")"
)
else
# If we don't want authentication
@@ -192,7 +195,7 @@ src_configure() {
# default-enabled upstream
use rule-editor && tools+=( ruledit ruleup )
emesonargs+=(
-Dtools=$(IFS=, ; echo ${tools[*]})
-Dtools=$(meson-format-array ${tools[*]})
)
# Anything that can be trivially set by meson_use goes here