From c59f678db219afd694b5d5ff59a93552158876d5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Sep 2020 10:38:17 -0700
Subject: [PATCH] frr: update to 7.4.

Also enable cross builds using the new --with-clippy option.
---
 srcpkgs/frr-devel    |  1 +
 srcpkgs/frr/template | 30 ++++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/frr-devel

diff --git a/srcpkgs/frr-devel b/srcpkgs/frr-devel
new file mode 120000
index 00000000000..6060b277e4e
--- /dev/null
+++ b/srcpkgs/frr-devel
@@ -0,0 +1 @@
+frr
\ No newline at end of file
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 019022d486b..2989adf98b2 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
-version=7.3.1
-revision=2
+version=7.4
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
@@ -13,17 +13,16 @@ make_build_args="SPHINXBUILD=sphinx-build3"
 conf_files="/etc/frr/*.conf"
 make_dirs="/var/log/frr 0700 _frr _frr"
 hostmakedepends="pkg-config flex bison autoconf automake libtool
- python python3 python3-Sphinx python-devel python3-devel libyang-tools"
+ python3 python3-Sphinx python3-devel libyang-tools"
 makedepends="pcre-devel libcap-devel json-c-devel pam-devel c-ares-devel
- readline-devel python-devel python3-devel libyang-devel"
+ readline-devel python3-devel libyang-devel"
 short_desc="IP routing protocol suite"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://frrouting.org"
 distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
-checksum=81129f83ce9ae31c983bb02b3d8e3e457604bab46f01411c945d9c2cfef1f5c8
+checksum=3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a
 python_version=3
-nocross="http://ix.io/1rQ6"
 system_groups="_frrvty"
 system_accounts="_frr"
 _frr_groups="_frrvty"
@@ -34,11 +33,23 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
+subpackages="libfrrospfapiclient libfrrospfapiclient-devel libfrr libfrr-devel frr-flush frr-reload"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" frr-devel"
+	configure_args+=" --with-clippy=/usr/libexec/frr-devel/clippy"
+else
+	subpackages+=" frr-devel"
+fi
+
 pre_configure() {
 	autoreconf -fi
 }
 
 post_install() {
+	if [ -z "$CROSS_BUILD" ]; then
+		# install build tool to be used by cross builds
+		vinstall lib/clippy 0755 usr/libexec/frr-devel
+	fi
 	# LSB init script and friends are not needed
 	for cmd in frr watchfrr watchfrr.sh frrcommon.sh frrinit.sh generate_support_bundle.py; do
 		rm -f -- "${DESTDIR}/usr/bin/${cmd}"
@@ -58,6 +69,13 @@ post_install() {
 	done
 }
 
+frr-devel_package() {
+	short_desc+=" (development binaries)"
+	pkg_install() {
+		vmove usr/libexec/frr-devel
+	}
+}
+
 frr-flush_package() {
 	short_desc+=" - route flushing tool"
 	depends="iproute2 ${sourcepkg}-${version}_${revision}"