diff --git a/sci-geosciences/grass/files/grass-8.5.0-mariadb.patch b/sci-geosciences/grass/files/grass-8.5.0-mariadb.patch new file mode 100644 index 0000000000000..7ab16323af658 --- /dev/null +++ b/sci-geosciences/grass/files/grass-8.5.0-mariadb.patch @@ -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) + diff --git a/sci-geosciences/grass/grass-8.5.0.ebuild b/sci-geosciences/grass/grass-8.5.0-r1.ebuild similarity index 98% rename from sci-geosciences/grass/grass-8.5.0.ebuild rename to sci-geosciences/grass/grass-8.5.0-r1.ebuild index 28905f6bc92ca..d59eb1698d86b 100644 --- a/sci-geosciences/grass/grass-8.5.0.ebuild +++ b/sci-geosciences/grass/grass-8.5.0-r1.ebuild @@ -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 }