| 1 |
commit: e5b933ac1ada8ca7f85964bc3400ca9b70a6cce6 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Tue Mar 30 18:15:41 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 30 18:27:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b933ac |
| 7 |
|
| 8 |
net-misc/frr: Swith to myconf array in src_configure() |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/779376 |
| 11 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/20202 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
net-misc/frr/frr-7.5.1-r2.ebuild | 59 +++++++++++++++++++++------------------- |
| 16 |
1 file changed, 31 insertions(+), 28 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild |
| 19 |
index 3dc03767e32..9e16c18b16d 100644 |
| 20 |
--- a/net-misc/frr/frr-7.5.1-r2.ebuild |
| 21 |
+++ b/net-misc/frr/frr-7.5.1-r2.ebuild |
| 22 |
@@ -57,36 +57,39 @@ src_prepare() { |
| 23 |
} |
| 24 |
|
| 25 |
src_configure() { |
| 26 |
- econf \ |
| 27 |
- --disable-static \ |
| 28 |
- --with-pkg-extra-version="-gentoo" \ |
| 29 |
- --enable-configfile-mask=0640 \ |
| 30 |
- --enable-logfile-mask=0640 \ |
| 31 |
- --prefix="${EPREFIX}"/usr \ |
| 32 |
- --libdir="${EPREFIX}"/usr/lib/frr \ |
| 33 |
- --sbindir="${EPREFIX}"/usr/lib/frr \ |
| 34 |
- --libexecdir="${EPREFIX}"/usr/lib/frr \ |
| 35 |
- --sysconfdir="${EPREFIX}"/etc/frr \ |
| 36 |
- --localstatedir="${EPREFIX}"/run/frr \ |
| 37 |
- --with-moduledir="${EPREFIX}"/usr/lib/frr/modules \ |
| 38 |
+ local myconf=( |
| 39 |
+ --disable-static |
| 40 |
+ --with-pkg-extra-version="-gentoo" |
| 41 |
+ --enable-configfile-mask=0640 |
| 42 |
+ --enable-logfile-mask=0640 |
| 43 |
+ --prefix="${EPREFIX}"/usr |
| 44 |
+ --libdir="${EPREFIX}"/usr/lib/frr |
| 45 |
+ --sbindir="${EPREFIX}"/usr/lib/frr |
| 46 |
+ --libexecdir="${EPREFIX}"/usr/lib/frr |
| 47 |
+ --sysconfdir="${EPREFIX}"/etc/frr |
| 48 |
+ --localstatedir="${EPREFIX}"/run/frr |
| 49 |
+ --with-moduledir="${EPREFIX}"/usr/lib/frr/modules |
| 50 |
--with-clippy="${BROOT}"/usr/bin/clippy |
| 51 |
- --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \ |
| 52 |
- --enable-user=frr \ |
| 53 |
- --enable-group=frr \ |
| 54 |
- --enable-vty-group=frr \ |
| 55 |
- --enable-multipath=64 \ |
| 56 |
- $(use_enable doc) \ |
| 57 |
- $(use_enable fpm) \ |
| 58 |
- $(use_enable grpc) \ |
| 59 |
- $(use_enable ipv6 ospf6d) \ |
| 60 |
- $(use_enable ipv6 ripngd) \ |
| 61 |
- $(use_enable ipv6 rtadv) \ |
| 62 |
- $(use_enable kernel_linux realms) \ |
| 63 |
- $(use_enable nhrp nhrpd) \ |
| 64 |
- $(usex ospfapi '--enable-ospfclient' '' '' '') \ |
| 65 |
- $(use_enable rpki) \ |
| 66 |
- $(use_enable snmp) \ |
| 67 |
+ --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples |
| 68 |
+ --enable-user=frr |
| 69 |
+ --enable-group=frr |
| 70 |
+ --enable-vty-group=frr |
| 71 |
+ --enable-multipath=64 |
| 72 |
+ $(use_enable doc) |
| 73 |
+ $(use_enable fpm) |
| 74 |
+ $(use_enable grpc) |
| 75 |
+ $(use_enable ipv6 ospf6d) |
| 76 |
+ $(use_enable ipv6 ripngd) |
| 77 |
+ $(use_enable ipv6 rtadv) |
| 78 |
+ $(use_enable kernel_linux realms) |
| 79 |
+ $(use_enable nhrp nhrpd) |
| 80 |
+ $(usex ospfapi '--enable-ospfclient' '' '' '') |
| 81 |
+ $(use_enable rpki) |
| 82 |
+ $(use_enable snmp) |
| 83 |
$(use_enable systemd) |
| 84 |
+ ) |
| 85 |
+ |
| 86 |
+ econf "${myconf[@]}" |
| 87 |
} |
| 88 |
|
| 89 |
src_compile() { |
Archives