|
 |
7570e2 |
From c82a4d170e04b84aa0a630ed8142ec4220efaff9 Mon Sep 17 00:00:00 2001
|
|
|
7570e2 |
Message-Id: <c82a4d170e04b84aa0a630ed8142ec4220efaff9.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: fix parsing issue on libbpf_dir option
|
|
|
7570e2 |
|
|
|
7570e2 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2009355
|
|
|
7570e2 |
Upstream Status: iproute2.git commit 48c379bc
|
|
|
7570e2 |
|
|
|
7570e2 |
commit 48c379bc2afd43b3246f68ed46475f5318b1218f
|
|
|
7570e2 |
Author: Andrea Claudi <aclaudi@redhat.com>
|
|
|
7570e2 |
Date: Thu Oct 14 10:50:50 2021 +0200
|
|
|
7570e2 |
|
|
|
7570e2 |
configure: fix parsing issue on libbpf_dir option
|
|
|
7570e2 |
|
|
|
7570e2 |
configure is stuck in an endless loop if '--libbpf_dir' option is used
|
|
|
7570e2 |
without a value:
|
|
|
7570e2 |
|
|
|
7570e2 |
$ ./configure --libbpf_dir
|
|
|
7570e2 |
./configure: line 515: shift: 2: shift count out of range
|
|
|
7570e2 |
./configure: line 515: shift: 2: shift count out of range
|
|
|
7570e2 |
[...]
|
|
|
7570e2 |
|
|
|
7570e2 |
Fix it splitting 'shift 2' into two consecutive shifts, and making the
|
|
|
7570e2 |
second one conditional to the number of remaining arguments.
|
|
|
7570e2 |
|
|
|
7570e2 |
A check is also provided after the while loop to verify the libbpf dir
|
|
|
7570e2 |
exists; also, as LIBBPF_DIR does not have a default value, configure bails
|
|
|
7570e2 |
out if the user does not specify a value after --libbpf_dir, thus avoiding
|
|
|
7570e2 |
to produce an erroneous configuration.
|
|
|
7570e2 |
|
|
|
7570e2 |
Fixes: 7ae2585b865a ("configure: convert LIBBPF environment variables to command-line options")
|
|
|
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 | 10 +++++++---
|
|
|
7570e2 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
7570e2 |
|
|
|
7570e2 |
diff --git a/configure b/configure
|
|
|
7570e2 |
index ea9051ab..0f304206 100755
|
|
|
7570e2 |
--- a/configure
|
|
|
7570e2 |
+++ b/configure
|
|
|
7570e2 |
@@ -486,7 +486,7 @@ usage()
|
|
|
7570e2 |
cat <
|
|
|
7570e2 |
Usage: $0 [OPTIONS]
|
|
|
7570e2 |
--include_dir <dir> Path to iproute2 include dir
|
|
|
7570e2 |
- --libbpf_dir Path to libbpf DESTDIR
|
|
|
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 |
@@ -506,8 +506,9 @@ else
|
|
|
7570e2 |
INCLUDE="$1"
|
|
|
7570e2 |
[ "$#" -gt 0 ] && shift ;;
|
|
|
7570e2 |
--libbpf_dir)
|
|
|
7570e2 |
- LIBBPF_DIR="$2"
|
|
|
7570e2 |
- shift 2 ;;
|
|
|
7570e2 |
+ shift
|
|
|
7570e2 |
+ LIBBPF_DIR="$1"
|
|
|
7570e2 |
+ [ "$#" -gt 0 ] && shift ;;
|
|
|
7570e2 |
--libbpf_force)
|
|
|
7570e2 |
if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then
|
|
|
7570e2 |
usage 1
|
|
|
7570e2 |
@@ -525,6 +526,9 @@ else
|
|
|
7570e2 |
fi
|
|
|
7570e2 |
|
|
|
7570e2 |
[ -d "$INCLUDE" ] || usage 1
|
|
|
7570e2 |
+if [ "${LIBBPF_DIR-unused}" != "unused" ]; then
|
|
|
7570e2 |
+ [ -d "$LIBBPF_DIR" ] || usage 1
|
|
|
7570e2 |
+fi
|
|
|
7570e2 |
|
|
|
7570e2 |
echo "# Generated config based on" $INCLUDE >$CONFIG
|
|
|
7570e2 |
quiet_config >> $CONFIG
|
|
|
7570e2 |
--
|
|
|
7570e2 |
2.31.1
|
|
|
7570e2 |
|