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 DFF62138334 for ; Wed, 19 Jun 2019 15:03:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0EA2E0930; Wed, 19 Jun 2019 15:03:51 +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 D34CFE0930 for ; Wed, 19 Jun 2019 15:03:51 +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 8EAF93464CE for ; Wed, 19 Jun 2019 15:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 055A95C0 for ; Wed, 19 Jun 2019 15:03:49 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1560956622.f523cdc975e9726f259f5f661332e57e9e499b26.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mumble/mumble-9999.ebuild X-VCS-Directories: media-sound/mumble/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: f523cdc975e9726f259f5f661332e57e9e499b26 X-VCS-Branch: master Date: Wed, 19 Jun 2019 15:03:49 +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: 85427232-1d6c-49d4-b6d2-f306b0835ad8 X-Archives-Hash: 199d2c9a9c230a6b0e090fc42464c4fd commit: f523cdc975e9726f259f5f661332e57e9e499b26 Author: Michał Górny gentoo org> AuthorDate: Wed Jun 19 14:50:49 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jun 19 15:03:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f523cdc9 media-sound/mumble: Build multilib libmumble.so* Closes: https://bugs.gentoo.org/267441 Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Lars Wendler gentoo.org> media-sound/mumble/mumble-9999.ebuild | 40 ++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index d15c4124e79..30b2055c37f 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop qmake-utils xdg +inherit desktop multilib-build qmake-utils xdg DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" HOMEPAGE="https://wiki.mumble.info" @@ -63,6 +63,8 @@ BDEPEND=" virtual/pkgconfig " +# NB: qmake does not support multilib but it's fine to configure +# for the native ABI here src_configure() { myuse() { [[ -n "${1}" ]] || die "myuse: No use option given" @@ -97,16 +99,36 @@ src_configure() { DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" } -src_install() { - newdoc README.Linux README - dodoc CHANGES +multilib_src_compile() { + local emake_args=( + # place libmumble* in a subdirectory + DESTDIR_ADD="/${MULTILIB_ABI_FLAG}" + {C,L}FLAGS_ADD="$(get_abi_CFLAGS)" + ) + # build only overlay library for other ABIs + multilib_is_native_abi || emake_args+=( -C overlay_gl ) + emake "${emake_args[@]}" + emake clean +} + +src_compile() { + multilib_foreach_abi multilib_src_compile +} - local dir=release - if use debug; then - dir=debug +multilib_src_install() { + local dir=$(usex debug debug release) + dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* + if multilib_is_native_abi; then + dobin "${dir}"/mumble + dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* fi +} + +src_install() { + multilib_foreach_abi multilib_src_install - dobin "${dir}"/mumble + newdoc README.Linux README + dodoc CHANGES dobin scripts/mumble-overlay insinto /usr/share/services @@ -118,8 +140,6 @@ src_install() { doman man/mumble-overlay.1 doman man/mumble.1 - - dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* } pkg_preinst() {