From 43e14a2f9e8b49ec73490eccb5c08209fffbe7ce Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Fri, 23 Nov 2018 01:09:23 -0800 Subject: [PATCH] iproute2: fix broken configuration patch Since v4.13, iproute2 switched to a config.mk file with greater use of pkg-config for library/feature detection. Replace the old Config patch with one modifying the configure script but enabling the same changes: - explicitly disable TC_CONFIG_ATM - rely on feature detection for IP_CONFIG_SETNS and TC_CONFIG_XT Signed-off-by: Tony Ambardar --- .../network/utils/iproute2/patches/100-config.patch | 7 ------- .../utils/iproute2/patches/100-configure.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 package/network/utils/iproute2/patches/100-config.patch create mode 100644 package/network/utils/iproute2/patches/100-configure.patch diff --git a/package/network/utils/iproute2/patches/100-config.patch b/package/network/utils/iproute2/patches/100-config.patch deleted file mode 100644 index 7f23cfc35e..0000000000 --- a/package/network/utils/iproute2/patches/100-config.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- /dev/null -+++ b/Config -@@ -0,0 +1,4 @@ -+# Fixed config to disable ATM support even if present on host system -+IP_CONFIG_SETNS:=y -+TC_CONFIG_ATM:=n -+TC_CONFIG_XT:=y diff --git a/package/network/utils/iproute2/patches/100-configure.patch b/package/network/utils/iproute2/patches/100-configure.patch new file mode 100644 index 0000000000..248b1c0e01 --- /dev/null +++ b/package/network/utils/iproute2/patches/100-configure.patch @@ -0,0 +1,12 @@ +--- a/configure ++++ b/configure +@@ -32,7 +32,8 @@ int main(int argc, char **argv) { + } + EOF + +- if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then ++# OpenWrt: disable ATM support even if present on host system ++ if [ 1 -eq 0 ]; then + echo "TC_CONFIG_ATM:=y" >>$CONFIG + echo yes + else -- 2.25.1