diff options
Diffstat (limited to 'dev-util/meson/meson-9999.ebuild')
-rw-r--r-- | dev-util/meson/meson-9999.ebuild | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 3b18cdf978c3..e2a175666ca3 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" @@ -80,6 +80,13 @@ python_test() { # 'test cases/unit/73 summary' expects 80 columns export COLUMNS=80 + # If JAVA_HOME is not set, meson looks for javac in PATH. + # If javac is in /usr/bin, meson assumes /usr/include is a valid + # JDK include path. Setting JAVA_HOME works around this broken + # autodection. If no JDK is installed, we should end up with an empty + # value in JAVA_HOME, and the tests should get skipped. + export JAVA_HOME=$(java-config -O 2>/dev/null) + ${EPYTHON} -u run_tests.py ) || die "Testing failed with ${EPYTHON}" } |