patches for DPDK stable branches
 help / color / mirror / Atom feed
* [PATCH] build: encapsulate grep for local_miss_maps in a function
@ 2022-03-08 18:52 Usama Arif
  2022-03-08 21:05 ` Thomas Monjalon
  0 siblings, 1 reply; 2+ messages in thread
From: Usama Arif @ 2022-03-08 18:52 UTC (permalink / raw)
  To: dev, david.marchand, thomas; +Cc: fam.zheng, liangma, Usama Arif, stable

check-symbols-maps.sh runs with the -e option to exit as soon as
there is an error. Currently the build is failing as the search of
grep -L is empty (which is the case for all version.map files as
they have the local symbol) which causes the script to return
with an error.
This patch encapsulates the grep call in a function, so that only the function
errors out and the build is successful.

Fixes: b403498e14 ("build: hide local symbols in shared libraries")
Cc: stable@dpdk.org
Signed-off-by: Usama Arif <usama.arif@bytedance.com>
---
 devtools/check-symbol-maps.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/devtools/check-symbol-maps.sh b/devtools/check-symbol-maps.sh
index 8266fdf9ea..96c479138f 100755
--- a/devtools/check-symbol-maps.sh
+++ b/devtools/check-symbol-maps.sh
@@ -53,7 +53,14 @@ if [ -n "$duplicate_symbols" ] ; then
     ret=1
 fi
 
-local_miss_maps=$(grep -L 'local: \*;' $@)
+find_local_miss_maps ()
+{
+    local local_miss_maps=$(grep -L 'local: \*;' $@)
+    echo "$local_miss_maps"
+
+}
+
+local_miss_maps=$(find_local_miss_maps $@)
 if [ -n "$local_miss_maps" ] ; then
     echo "Found maps without local catch-all:"
     echo "$local_miss_maps"
-- 
2.25.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] build: encapsulate grep for local_miss_maps in a function
  2022-03-08 18:52 [PATCH] build: encapsulate grep for local_miss_maps in a function Usama Arif
@ 2022-03-08 21:05 ` Thomas Monjalon
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Monjalon @ 2022-03-08 21:05 UTC (permalink / raw)
  To: Usama Arif; +Cc: dev, david.marchand, fam.zheng, liangma, stable

08/03/2022 19:52, Usama Arif:
> check-symbols-maps.sh runs with the -e option to exit as soon as
> there is an error. Currently the build is failing as the search of
> grep -L is empty (which is the case for all version.map files as
> they have the local symbol) which causes the script to return
> with an error.

It depends on the shell I guess because most machines run well.

> This patch encapsulates the grep call in a function, so that only the function
> errors out and the build is successful.

That's a strange workaround. I don't understand why it works.
I am submitting a simpler fix adding " || true"

> -local_miss_maps=$(grep -L 'local: \*;' $@)
> +find_local_miss_maps ()
> +{
> +    local local_miss_maps=$(grep -L 'local: \*;' $@)
> +    echo "$local_miss_maps"
> +
> +}
> +
> +local_miss_maps=$(find_local_miss_maps $@)

Thanks for raising the issue and proposing a solution.



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-08 21:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-08 18:52 [PATCH] build: encapsulate grep for local_miss_maps in a function Usama Arif
2022-03-08 21:05 ` Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).