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 E3D061382C5 for ; Sun, 27 Dec 2020 19:19:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32811E0D7D; Sun, 27 Dec 2020 19:19:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17857E0D7D for ; Sun, 27 Dec 2020 19:19:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1A4C0341506 for ; Sun, 27 Dec 2020 19:19:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2AD2473 for ; Sun, 27 Dec 2020 19:19:03 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1609096735.c38c696020171d096301fdd088f179fa9c51211d.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/wayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/wayland/wayland-9999.ebuild X-VCS-Directories: dev-libs/wayland/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c38c696020171d096301fdd088f179fa9c51211d X-VCS-Branch: master Date: Sun, 27 Dec 2020 19:19:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a469f0ec-c998-4399-9af8-c1f72a806265 X-Archives-Hash: da75a6c8657226b1329ba52c991b8c3c commit: c38c696020171d096301fdd088f179fa9c51211d Author: Matt Turner gentoo org> AuthorDate: Wed Mar 4 19:10:15 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Dec 27 19:18:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38c6960 dev-libs/wayland: Convert to meson Signed-off-by: Matt Turner gentoo.org> dev-libs/wayland/wayland-9999.ebuild | 49 ++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild index a38a62436cd..c3d2b584f4c 100644 --- a/dev-libs/wayland/wayland-9999.ebuild +++ b/dev-libs/wayland/wayland-9999.ebuild @@ -10,7 +10,7 @@ else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -inherit autotools libtool multilib-minimal toolchain-funcs +inherit meson multilib-minimal DESCRIPTION="Wayland protocol libraries" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" @@ -20,12 +20,12 @@ SLOT="0" IUSE="doc" BDEPEND=" + ~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.6[dot] app-text/xmlto >=media-gfx/graphviz-2.26.0 - sys-apps/grep[pcre] ) " DEPEND=" @@ -35,34 +35,51 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - default - [[ $PV = 9999* ]] && eautoreconf || elibtoolize +meson_multilib() { + if multilib_is_native_abi; then + echo true + else + echo false + fi +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi } multilib_src_configure() { - local myeconfargs=( - --disable-static - $(multilib_native_use_enable doc documentation) - $(multilib_native_enable dtd-validation) + local emesonargs=( + -Ddocumentation=$(meson_multilib_native_use doc) + -Ddtd_validation=$(meson_multilib) + -Dlibraries=true + -Dscanner=false ) - tc-is-cross-compiler && myeconfargs+=( --with-host-scanner ) + meson_src_configure +} - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +multilib_src_compile() { + meson_src_compile } -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - einstalldocs +multilib_src_test() { + meson_src_test } src_test() { # We set it on purpose to only a short subdir name, as socket paths are # created in there, which are 108 byte limited. With this it hopefully - # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr - export XDG_RUNTIME_DIR="${T}"/xdr + # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x + export XDG_RUNTIME_DIR="${T}"/x mkdir "${XDG_RUNTIME_DIR}" || die chmod 0700 "${XDG_RUNTIME_DIR}" || die multilib-minimal_src_test } + +multilib_src_install() { + meson_src_install +}