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 A5469138334 for ; Fri, 1 Nov 2019 16:24:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82639E0882; Fri, 1 Nov 2019 16:24:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6BD58E0882 for ; Fri, 1 Nov 2019 16:24:01 +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 BEEFD34C662 for ; Fri, 1 Nov 2019 16:23:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDCF18A5 for ; Fri, 1 Nov 2019 16:23:54 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1572625376.a2fe287d8d14eec542a5c3bf03bbed26273db13c.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/iwd/iwd-9999.ebuild X-VCS-Directories: net-wireless/iwd/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: a2fe287d8d14eec542a5c3bf03bbed26273db13c X-VCS-Branch: master Date: Fri, 1 Nov 2019 16:23:54 +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: 5dc9d391-a00d-493e-ab40-8319b6d55301 X-Archives-Hash: 95a8a3bc2b7b16fb633d280677216486 commit: a2fe287d8d14eec542a5c3bf03bbed26273db13c Author: Ben Kohler gentoo org> AuthorDate: Fri Nov 1 15:41:19 2019 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Nov 1 16:22:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fe287d net-wireless/iwd: use internal ell for 9999 & ell path Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-9999.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index e6fd9bb55d3..73b6abfd6a4 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -103,7 +103,7 @@ pkg_pretend() { src_unpack() { if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${S}/ell git-r3_src_unpack + EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack else default fi @@ -118,16 +118,19 @@ src_prepare() { src_configure() { append-cflags "-fsigned-char" - econf --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var \ + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var \ $(use_enable client) \ $(use_enable monitor) \ $(use_enable ofono) \ $(use_enable wired) \ - --enable-external-ell \ --enable-systemd-service \ --with-systemd-unitdir="$(systemd_get_systemunitdir)" \ --with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d) \ --with-systemd-networkdir="$(systemd_get_utildir)/network" + ) + [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell) + econf "${myeconfargs[@]}" } src_install() {