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 3028D1382C5 for ; Tue, 30 Mar 2021 18:28:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C065E0BEB; Tue, 30 Mar 2021 18:27:59 +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 4FBF7E0BEB for ; Tue, 30 Mar 2021 18:27:59 +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 5F2CA340CBB for ; Tue, 30 Mar 2021 18:27:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0A2F633 for ; Tue, 30 Mar 2021 18:27:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617128854.e5b933ac1ada8ca7f85964bc3400ca9b70a6cce6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/frr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/frr/frr-7.5.1-r2.ebuild X-VCS-Directories: net-misc/frr/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e5b933ac1ada8ca7f85964bc3400ca9b70a6cce6 X-VCS-Branch: master Date: Tue, 30 Mar 2021 18:27:56 +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: 32ea51b5-ee82-4c30-a5e7-e72edac3cd5e X-Archives-Hash: cdd25586aa283fb2771081925934aac6 commit: e5b933ac1ada8ca7f85964bc3400ca9b70a6cce6 Author: Jakov Smolic sartura hr> AuthorDate: Tue Mar 30 18:15:41 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 30 18:27:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b933ac net-misc/frr: Swith to myconf array in src_configure() Closes: https://bugs.gentoo.org/779376 Signed-off-by: Jakov Smolic sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/20202 Signed-off-by: Sam James gentoo.org> net-misc/frr/frr-7.5.1-r2.ebuild | 59 +++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild index 3dc03767e32..9e16c18b16d 100644 --- a/net-misc/frr/frr-7.5.1-r2.ebuild +++ b/net-misc/frr/frr-7.5.1-r2.ebuild @@ -57,36 +57,39 @@ src_prepare() { } src_configure() { - econf \ - --disable-static \ - --with-pkg-extra-version="-gentoo" \ - --enable-configfile-mask=0640 \ - --enable-logfile-mask=0640 \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/lib/frr \ - --sbindir="${EPREFIX}"/usr/lib/frr \ - --libexecdir="${EPREFIX}"/usr/lib/frr \ - --sysconfdir="${EPREFIX}"/etc/frr \ - --localstatedir="${EPREFIX}"/run/frr \ - --with-moduledir="${EPREFIX}"/usr/lib/frr/modules \ + local myconf=( + --disable-static + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules --with-clippy="${BROOT}"/usr/bin/clippy - --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \ - --enable-user=frr \ - --enable-group=frr \ - --enable-vty-group=frr \ - --enable-multipath=64 \ - $(use_enable doc) \ - $(use_enable fpm) \ - $(use_enable grpc) \ - $(use_enable ipv6 ospf6d) \ - $(use_enable ipv6 ripngd) \ - $(use_enable ipv6 rtadv) \ - $(use_enable kernel_linux realms) \ - $(use_enable nhrp nhrpd) \ - $(usex ospfapi '--enable-ospfclient' '' '' '') \ - $(use_enable rpki) \ - $(use_enable snmp) \ + --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) $(use_enable systemd) + ) + + econf "${myconf[@]}" } src_compile() {