From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6B403139694 for ; Sun, 21 May 2017 19:51:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 230C5E0E88; Sun, 21 May 2017 19:51:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7C42E0E88 for ; Sun, 21 May 2017 19:51:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5C1F34169D for ; Sun, 21 May 2017 19:51:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14A877446 for ; Sun, 21 May 2017 19:51:24 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1495396249.5fe09d0d25b28455f712ceab14fba82c82915531.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/meson.eclass X-VCS-Directories: eclass/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 5fe09d0d25b28455f712ceab14fba82c82915531 X-VCS-Branch: master Date: Sun, 21 May 2017 19:51:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7d1353f3-4459-40ed-ba6b-a1801bc4b878 X-Archives-Hash: ffc82c1a319e6a560a656737d96d0366 commit: 5fe09d0d25b28455f712ceab14fba82c82915531 Author: Coacher gmail com> AuthorDate: Sun May 21 19:36:29 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun May 21 19:50:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe09d0d meson.eclass: misc improvements for #619178 eclass/meson.eclass | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 9a006057e92..758e4180ba7 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -37,14 +37,18 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac -EXPORT_FUNCTIONS src_configure src_compile src_test src_install - if [[ -z ${_MESON_ECLASS} ]]; then -_MESON_ECLASS=1 # FIXME: We will need to inherit toolchain-funcs as well to support crossdev. inherit ninja-utils +fi + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install + +if [[ -z ${_MESON_ECLASS} ]]; then +_MESON_ECLASS=1 + DEPEND=">=dev-util/meson-0.39.1 >=dev-util/ninja-1.7.2" @@ -57,7 +61,7 @@ DEPEND=">=dev-util/meson-0.39.1 # @ECLASS-VARIABLE: EMESON_SOURCE # @DEFAULT_UNSET # @DESCRIPTION: -# The location of the source files for the project;this is the source +# The location of the source files for the project; this is the source # directory to pass to meson. # If this isn't set, it defaults to ${S} @@ -67,17 +71,17 @@ DEPEND=">=dev-util/meson-0.39.1 # Optional meson arguments as Bash array; this should be defined before # calling meson_src_configure. -# create a cross file for meson +# Create a cross file for meson # fixme: This function should write a cross file as described at the # following url. -# http://mesonbuild.com/Cross-compilation.html +# http://mesonbuild.com/Cross-compilation.html # _meson_create_cross_file() { # touch "${T}"/meson.crossfile # } # @FUNCTION: meson_src_configure # @DESCRIPTION: -# this is the meson_src_configure function +# This is the meson_src_configure function meson_src_configure() { debug-print-function ${FUNCNAME} "$@" @@ -86,7 +90,7 @@ meson_src_configure() { --buildtype plain --libdir "$(get_libdir)" --localstatedir "${EPREFIX}/var/lib" - --prefix "${EPREFIX}"/usr + --prefix "${EPREFIX}/usr" --sysconfdir "${EPREFIX}/etc" ) @@ -114,25 +118,26 @@ meson_src_configure() { meson_src_compile() { debug-print-function ${FUNCNAME} "$@" - eninja -v -C "${BUILD_DIR}" + eninja -C "${BUILD_DIR}" } # @FUNCTION: meson_src_test # @DESCRIPTION: -# this is the meson_src_test function. +# This is the meson_src_test function. meson_src_test() { debug-print-function ${FUNCNAME} "$@" - eninja -v -C "${BUILD_DIR}" test + eninja -C "${BUILD_DIR}" test } # @FUNCTION: meson_src_install # @DESCRIPTION: -# this is the meson_src_install function. +# This is the meson_src_install function. meson_src_install() { debug-print-function ${FUNCNAME} "$@" - DESTDIR="${D}" eninja -v -C "${BUILD_DIR}" install + DESTDIR="${D}" eninja -C "${BUILD_DIR}" install + einstalldocs } fi