gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sci-geosciences/grass: fix MariaDB dependency

Browse Source 
Closes: https://bugs.gentoo.org/975254
Signed-off-by: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
Part-of: https://github.com/gentoo/gentoo/pull/46332
Closes: https://github.com/gentoo/gentoo/pull/46332
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Mario Haustein
2026-05-31 09:23:48 +02:00
committed by Sam James
parent fa6c89c14c
commit 4cf68f0f6f
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sci-geosciences/grass/files/grass-8.5.0-mariadb.patch Normal file
View File

@@ -0,0 +1,17 @@
Bug: https://bugs.gentoo.org/975252
diff --git a/cmake/find_scripts/FindMySQL.cmake b/cmake/find_scripts/FindMySQL.cmake
index 59f36a0772..12f7d574d4 100644
--- a/cmake/find_scripts/FindMySQL.cmake
+++ b/cmake/find_scripts/FindMySQL.cmake
@@ -1,9 +1,9 @@
execute_process(
- COMMAND mysql_config --cflags
+ COMMAND mariadb_config --cflags
OUTPUT_VARIABLE MySQL_INCLUDE_DIRS
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
- COMMAND mysql_config --libs
+ COMMAND mariadb_config --libs
OUTPUT_VARIABLE MySQL_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE)

6
sci-geosciences/grass/grass-8.5.0.ebuild → sci-geosciences/grass/grass-8.5.0-r1.ebuild
View File

@@ -77,7 +77,7 @@ RDEPEND="
virtual/lapack[flexiblas(-)]
)
)
mysql? ( dev-db/mysql-connector-c:= )
mysql? ( dev-db/mariadb-connector-c:= )
netcdf? ( sci-libs/netcdf:= )
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
@@ -115,6 +115,10 @@ BDEPEND="
RESTRICT="test"
PATCHES=(
"${FILESDIR}/${P}-mariadb.patch"
)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}