summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2021-03-30 19:15:41 +0100
committerSam James <sam@gentoo.org>2021-03-30 19:27:34 +0100
commite5b933ac1ada8ca7f85964bc3400ca9b70a6cce6 (patch)
tree86b158f0dcd6e4f27db897a79cb75fd1f6c1f08e
parentwww-client/firefox: fix building on arm (diff)
downloadgentoo-e5b933ac.tar.gz
gentoo-e5b933ac.tar.bz2
gentoo-e5b933ac.zip
net-misc/frr: Swith to myconf array in src_configure()
Closes: https://bugs.gentoo.org/779376 Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/20202 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--net-misc/frr/frr-7.5.1-r2.ebuild59
1 files 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 3dc03767e32c..9e16c18b16dc 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() {