commit: 50100e3801575c1fce367d1d426e9ea013e922e9 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jun 12 18:14:55 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jun 12 18:21:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50100e38
dev-util/meson: bump to 0.58.1 Closes: https://bugs.gentoo.org/791346 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/meson/Manifest | 1 + dev-util/meson/{meson-9999.ebuild => meson-0.58.1.ebuild} | 9 ++++++++- dev-util/meson/meson-9999.ebuild | 9 ++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 765d085eb49..cbe47bf22dc 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1 +1,2 @@ DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e +DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453 diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-0.58.1.ebuild similarity index 84% copy from dev-util/meson/meson-9999.ebuild copy to dev-util/meson/meson-0.58.1.ebuild index 3b18cdf978c..e2a175666ca 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-0.58.1.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}" } diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 3b18cdf978c..e2a175666ca 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}" }
