|
 |
7570e2 |
From 825f5869248638159d30aff05b5d81246dc8a208 Mon Sep 17 00:00:00 2001
|
|
|
7570e2 |
Message-Id: <825f5869248638159d30aff05b5d81246dc8a208.1637749821.git.aclaudi@redhat.com>
|
|
|
7570e2 |
In-Reply-To: <cef782ca658d695c5ca2d174ba1f89cba6bd84e5.1637749821.git.aclaudi@redhat.com>
|
|
|
7570e2 |
References: <cef782ca658d695c5ca2d174ba1f89cba6bd84e5.1637749821.git.aclaudi@redhat.com>
|
|
|
7570e2 |
From: Andrea Claudi <aclaudi@redhat.com>
|
|
|
7570e2 |
Date: Wed, 24 Nov 2021 11:28:08 +0100
|
|
|
7570e2 |
Subject: [PATCH] configure: simplify options parsing
|
|
|
7570e2 |
|
|
|
7570e2 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2009355
|
|
|
7570e2 |
Upstream Status: iproute2.git commit 99245d17
|
|
|
7570e2 |
|
|
|
7570e2 |
commit 99245d1741a85e4397973782578d4a78673eb348
|
|
|
7570e2 |
Author: Andrea Claudi <aclaudi@redhat.com>
|
|
|
7570e2 |
Date: Thu Oct 14 10:50:52 2021 +0200
|
|
|
7570e2 |
|
|
|
7570e2 |
configure: simplify options parsing
|
|
|
7570e2 |
|
|
|
7570e2 |
This commit simplifies options parsing moving all the code not related to
|
|
|
7570e2 |
parsing out of the case statement.
|
|
|
7570e2 |
|
|
|
7570e2 |
- The conditional shift after the assignments is moved right after the
|
|
|
7570e2 |
case, reducing code duplication.
|
|
|
7570e2 |
- The semantic checks on the LIBBPF_FORCE value is moved after the loop
|
|
|
7570e2 |
like we already did for INCLUDE and LIBBPF_DIR.
|
|
|
7570e2 |
- Finally, the loop condition is changed to check remaining arguments, thus
|
|
|
7570e2 |
making it possible to get rid of the null string case break.
|
|
|
7570e2 |
|
|
|
7570e2 |
As a bonus, now the help message states that on or off should follow
|
|
|
7570e2 |
--libbpf_force
|
|
|
7570e2 |
|
|
|
7570e2 |
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
|
|
|
7570e2 |
Acked-by: Phil Sutter <phil@nwl.cc>
|
|
|
7570e2 |
Signed-off-by: David Ahern <dsahern@kernel.org>
|
|
|
7570e2 |
---
|
|
|
7570e2 |
configure | 37 ++++++++++++++++++-------------------
|
|
|
7570e2 |
1 file changed, 18 insertions(+), 19 deletions(-)
|
|
|
7570e2 |
|
|
|
7570e2 |
diff --git a/configure b/configure
|
|
|
7570e2 |
index 9ec19a5b..26e06eb8 100755
|
|
|
7570e2 |
--- a/configure
|
|
|
7570e2 |
+++ b/configure
|
|
|
7570e2 |
@@ -485,12 +485,12 @@ usage()
|
|
|
7570e2 |
{
|
|
|
7570e2 |
cat <
|
|
|
7570e2 |
Usage: $0 [OPTIONS]
|
|
|
7570e2 |
- --include_dir <dir> Path to iproute2 include dir
|
|
|
7570e2 |
- --libbpf_dir <dir> Path to libbpf DESTDIR
|
|
|
7570e2 |
- --libbpf_force Enable/disable libbpf by force. Available options:
|
|
|
7570e2 |
- on: require link against libbpf, quit config if no libbpf support
|
|
|
7570e2 |
- off: disable libbpf probing
|
|
|
7570e2 |
- -h | --help Show this usage info
|
|
|
7570e2 |
+ --include_dir <dir> Path to iproute2 include dir
|
|
|
7570e2 |
+ --libbpf_dir <dir> Path to libbpf DESTDIR
|
|
|
7570e2 |
+ --libbpf_force <on|off> Enable/disable libbpf by force. Available options:
|
|
|
7570e2 |
+ on: require link against libbpf, quit config if no libbpf support
|
|
|
7570e2 |
+ off: disable libbpf probing
|
|
|
7570e2 |
+ -h | --help Show this usage info
|
|
|
7570e2 |
EOF
|
|
|
7570e2 |
exit $1
|
|
|
7570e2 |
}
|
|
|
7570e2 |
@@ -499,31 +499,25 @@ EOF
|
|
|
7570e2 |
if [ $# -eq 1 ] && [ "$(echo $1 | cut -c 1)" != '-' ]; then
|
|
|
7570e2 |
INCLUDE="$1"
|
|
|
7570e2 |
else
|
|
|
7570e2 |
- while true; do
|
|
|
7570e2 |
+ while [ "$#" -gt 0 ]; do
|
|
|
7570e2 |
case "$1" in
|
|
|
7570e2 |
--include_dir)
|
|
|
7570e2 |
shift
|
|
|
7570e2 |
- INCLUDE="$1"
|
|
|
7570e2 |
- [ "$#" -gt 0 ] && shift ;;
|
|
|
7570e2 |
+ INCLUDE="$1" ;;
|
|
|
7570e2 |
--libbpf_dir)
|
|
|
7570e2 |
shift
|
|
|
7570e2 |
- LIBBPF_DIR="$1"
|
|
|
7570e2 |
- [ "$#" -gt 0 ] && shift ;;
|
|
|
7570e2 |
+ LIBBPF_DIR="$1" ;;
|
|
|
7570e2 |
--libbpf_force)
|
|
|
7570e2 |
- if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then
|
|
|
7570e2 |
- usage 1
|
|
|
7570e2 |
- fi
|
|
|
7570e2 |
- LIBBPF_FORCE=$2
|
|
|
7570e2 |
- shift 2 ;;
|
|
|
7570e2 |
+ shift
|
|
|
7570e2 |
+ LIBBPF_FORCE="$1" ;;
|
|
|
7570e2 |
-h | --help)
|
|
|
7570e2 |
usage 0 ;;
|
|
|
7570e2 |
--*)
|
|
|
7570e2 |
- shift ;;
|
|
|
7570e2 |
- "")
|
|
|
7570e2 |
- break ;;
|
|
|
7570e2 |
+ ;;
|
|
|
7570e2 |
*)
|
|
|
7570e2 |
usage 1 ;;
|
|
|
7570e2 |
esac
|
|
|
7570e2 |
+ [ "$#" -gt 0 ] && shift
|
|
|
7570e2 |
done
|
|
|
7570e2 |
fi
|
|
|
7570e2 |
|
|
|
7570e2 |
@@ -531,6 +525,11 @@ fi
|
|
|
7570e2 |
if [ "${LIBBPF_DIR-unused}" != "unused" ]; then
|
|
|
7570e2 |
[ -d "$LIBBPF_DIR" ] || usage 1
|
|
|
7570e2 |
fi
|
|
|
7570e2 |
+if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then
|
|
|
7570e2 |
+ if [ "$LIBBPF_FORCE" != 'on' ] && [ "$LIBBPF_FORCE" != 'off' ]; then
|
|
|
7570e2 |
+ usage 1
|
|
|
7570e2 |
+ fi
|
|
|
7570e2 |
+fi
|
|
|
7570e2 |
|
|
|
7570e2 |
echo "# Generated config based on" $INCLUDE >$CONFIG
|
|
|
7570e2 |
quiet_config >> $CONFIG
|
|
|
7570e2 |
--
|
|
|
7570e2 |
2.31.1
|
|
|
7570e2 |
|