From: Nick Hainke <vincent@systemli.org>
Date: Sat, 27 Aug 2022 12:09:16 +0000 (+0200)
Subject: iproute2: replace musl-compilation-fix with upstream fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9011f987d52e95e147ece6950267090e4d16ae3f;p=openwrt%2Fstaging%2Fnbd.git

iproute2: replace musl-compilation-fix with upstream fix

Instead of defining the MIN version it is enough to include "#include
<sys/param.h>".

Delete patch:
- 105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch

Add patch:
- 010-ipstats-Add-param.h-for-musl.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>
---

diff --git a/package/network/utils/iproute2/patches/010-ipstats-Add-param.h-for-musl.patch b/package/network/utils/iproute2/patches/010-ipstats-Add-param.h-for-musl.patch
new file mode 100644
index 0000000000..d99ae6e65c
--- /dev/null
+++ b/package/network/utils/iproute2/patches/010-ipstats-Add-param.h-for-musl.patch
@@ -0,0 +1,23 @@
+From cf6b60c504d4be5e1df2b2745e55d677967831d0 Mon Sep 17 00:00:00 2001
+From: Changhyeok Bae <changhyeok.bae@gmail.com>
+Date: Tue, 9 Aug 2022 04:01:05 +0000
+Subject: [PATCH 1/5] ipstats: Add param.h for musl
+
+Fix build error for musl
+| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: undefined reference to `MIN'
+
+Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
+---
+ ip/ipstats.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/ip/ipstats.c
++++ b/ip/ipstats.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0+
+ #include <assert.h>
+ #include <errno.h>
++#include <sys/param.h>
+ 
+ #include "list.h"
+ #include "utils.h"
diff --git a/package/network/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch b/package/network/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch
deleted file mode 100644
index 7bf55dd57b..0000000000
--- a/package/network/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c69e8e474936795a2cd7638b11ce3e99ff4d5ae7 Mon Sep 17 00:00:00 2001
-From: Nick Hainke <vincent@systemli.org>
-Date: Sat, 6 Aug 2022 10:00:20 +0200
-Subject: [PATCH] ipstats: Define MIN function to fix undefined references
-
-Fixes errors in the form of:
- in function `ipstats_show_64':
- <artificial>:(.text+0x4e30): undefined reference to `MIN'
-
-Signed-off-by: Nick Hainke <vincent@systemli.org>
----
- ip/ipstats.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -6,6 +6,10 @@
- #include "utils.h"
- #include "ip_common.h"
- 
-+#ifndef MIN
-+#define MIN(a, b) ((a) < (b) ? (a) : (b))
-+#endif
-+
- struct ipstats_stat_dump_filters {
- 	/* mask[0] filters outer attributes. Then individual nests have their
- 	 * filtering mask at the index of the nested attribute.