[PATCH] build: Fix missing variable quotes

[PATCH] build: Fix missing variable quotes

[Collin Funk]

When dlopen and pthread_create are in libc the variable is
set to "none required", therefore running configure will show
the following errors:

./configure: line 8997: test: too many arguments
./configure: line 8999: test: too many arguments
./configure: line 9003: test: too many arguments
./configure: line 9005: test: =: unary operator expected

ChangeLog:

	* configure.ac: Quote variable result of AC_SEARCH_LIBS.
        * configure: Regenerate.

Signed-off-by: Collin Funk <collin.funk1@gmail.com>
---
 configure    | 10 +++++-----
 configure.ac |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 51576a41f30..6e95b27d9df 100755
--- a/configure
+++ b/configure
@@ -8994,15 +8994,15 @@ if test "$ac_res" != no; then :
 fi
 
 
-if test $ac_cv_search_dlopen = -ldl; then
+if test "$ac_cv_search_dlopen" = -ldl; then
     CRAB1_LIBS="$CRAB1_LIBS -ldl"
-elif test $ac_cv_search_dlopen = no; then
+elif test "$ac_cv_search_dlopen" = no; then
     missing_rust_dynlibs="libdl"
 fi
 
-if test $ac_cv_search_pthread_create = -lpthread; then
+if test "$ac_cv_search_pthread_create" = -lpthread; then
     CRAB1_LIBS="$CRAB1_LIBS -lpthread"
-elif test $ac_cv_search_pthread_crate = no; then
+elif test "$ac_cv_search_pthread_crate" = no; then
     missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
 fi
 
@@ -19746,7 +19746,7 @@ config.status
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C)  Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
diff --git a/configure.ac b/configure.ac
index 5eda8dcdbf7..88576b31bfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2045,15 +2045,15 @@ missing_rust_dynlibs=none
 AC_SEARCH_LIBS([dlopen], [dl])
 AC_SEARCH_LIBS([pthread_create], [pthread])
 
-if test $ac_cv_search_dlopen = -ldl; then
+if test "$ac_cv_search_dlopen" = -ldl; then
     CRAB1_LIBS="$CRAB1_LIBS -ldl"
-elif test $ac_cv_search_dlopen = no; then
+elif test "$ac_cv_search_dlopen" = no; then
     missing_rust_dynlibs="libdl"
 fi
 
-if test $ac_cv_search_pthread_create = -lpthread; then
+if test "$ac_cv_search_pthread_create" = -lpthread; then
     CRAB1_LIBS="$CRAB1_LIBS -lpthread"
-elif test $ac_cv_search_pthread_crate = no; then
+elif test "$ac_cv_search_pthread_crate" = no; then
     missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
 fi
 
-- 
2.45.2

Re: [PATCH] build: Fix missing variable quotes

[Sam James]

[-- Attachment #1: Type: text/plain, Size: 2886 bytes --]

Collin Funk <collin.funk1@gmail.com> writes:

> When dlopen and pthread_create are in libc the variable is
> set to "none required", therefore running configure will show
> the following errors:
>
> ./configure: line 8997: test: too many arguments
> ./configure: line 8999: test: too many arguments
> ./configure: line 9003: test: too many arguments
> ./configure: line 9005: test: =: unary operator expected
>
> ChangeLog:
>
> 	* configure.ac: Quote variable result of AC_SEARCH_LIBS.
>         * configure: Regenerate.

This is PR115453 (which also needs to address a 'crate' typo).

>
> Signed-off-by: Collin Funk <collin.funk1@gmail.com>
> ---
>  configure    | 10 +++++-----
>  configure.ac |  8 ++++----
>  2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/configure b/configure
> index 51576a41f30..6e95b27d9df 100755
> --- a/configure
> +++ b/configure
> @@ -8994,15 +8994,15 @@ if test "$ac_res" != no; then :
>  fi
>  
>  
> -if test $ac_cv_search_dlopen = -ldl; then
> +if test "$ac_cv_search_dlopen" = -ldl; then
>      CRAB1_LIBS="$CRAB1_LIBS -ldl"
> -elif test $ac_cv_search_dlopen = no; then
> +elif test "$ac_cv_search_dlopen" = no; then
>      missing_rust_dynlibs="libdl"
>  fi
>  
> -if test $ac_cv_search_pthread_create = -lpthread; then
> +if test "$ac_cv_search_pthread_create" = -lpthread; then
>      CRAB1_LIBS="$CRAB1_LIBS -lpthread"
> -elif test $ac_cv_search_pthread_crate = no; then
> +elif test "$ac_cv_search_pthread_crate" = no; then
>      missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
>  fi
>  
> @@ -19746,7 +19746,7 @@ config.status
>  configured by $0, generated by GNU Autoconf 2.69,
>    with options \\"\$ac_cs_config\\"
>  
> -Copyright (C) 2012 Free Software Foundation, Inc.
> +Copyright (C)  Free Software Foundation, Inc.
>  This config.status script is free software; the Free Software Foundation
>  gives unlimited permission to copy, distribute and modify it."
>  
> diff --git a/configure.ac b/configure.ac
> index 5eda8dcdbf7..88576b31bfc 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2045,15 +2045,15 @@ missing_rust_dynlibs=none
>  AC_SEARCH_LIBS([dlopen], [dl])
>  AC_SEARCH_LIBS([pthread_create], [pthread])
>  
> -if test $ac_cv_search_dlopen = -ldl; then
> +if test "$ac_cv_search_dlopen" = -ldl; then
>      CRAB1_LIBS="$CRAB1_LIBS -ldl"
> -elif test $ac_cv_search_dlopen = no; then
> +elif test "$ac_cv_search_dlopen" = no; then
>      missing_rust_dynlibs="libdl"
>  fi
>  
> -if test $ac_cv_search_pthread_create = -lpthread; then
> +if test "$ac_cv_search_pthread_create" = -lpthread; then
>      CRAB1_LIBS="$CRAB1_LIBS -lpthread"
> -elif test $ac_cv_search_pthread_crate = no; then
> +elif test "$ac_cv_search_pthread_crate" = no; then
>      missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
>  fi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 377 bytes --]

Re: [PATCH] build: Fix missing variable quotes

[YunQiang Su]

Sam James <sam@gentoo.org> 于2024年6月14日周五 09:02写道：
>
> Collin Funk <collin.funk1@gmail.com> writes:
>
> > When dlopen and pthread_create are in libc the variable is
> > set to "none required", therefore running configure will show
> > the following errors:
> >
> > ./configure: line 8997: test: too many arguments
> > ./configure: line 8999: test: too many arguments
> > ./configure: line 9003: test: too many arguments
> > ./configure: line 9005: test: =: unary operator expected
> >
> > ChangeLog:
> >
> >       * configure.ac: Quote variable result of AC_SEARCH_LIBS.
> >         * configure: Regenerate.
>
> This is PR115453 (which also needs to address a 'crate' typo).
>

I noticed another similar problem. I guess that we can put them in a
single patch:
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5317,7 +5327,7 @@ x:

     AC_MSG_CHECKING(assembler and linker for explicit JALR relocation)
     gcc_cv_as_ld_jalr_reloc=no
-    if test $gcc_cv_as_mips_explicit_relocs = yes; then
+    if test x$gcc_cv_as_mips_explicit_relocs = xyes; then
       if test $in_tree_ld = yes ; then
         if test "$gcc_cv_gld_major_version" -eq 2 -a
"$gcc_cv_gld_minor_version" -ge 20 -o "$gcc_cv_gld_major_version" -gt
2 \
            && test $in_tree_ld_is_elf = yes; then

Re: [PATCH] build: Fix missing variable quotes

[YunQiang Su]

OK for trunk?


-- 
YunQiang Su

Re: [PATCH] build: Fix missing variable quotes

[Sam James]

YunQiang Su <wzssyqa@gmail.com> writes:

> OK for trunk?

It looks good to me, but I can't approve. (I'd dare say it's obvious,
even.)

Richard, any chance you could give it a quick ack?

Re: [PATCH] build: Fix missing variable quotes

[Richard Biener]

On Tue, Jun 18, 2024 at 10:35 AM Sam James <sam@gentoo.org> wrote:
>
> YunQiang Su <wzssyqa@gmail.com> writes:
>
> > OK for trunk?
>
> It looks good to me, but I can't approve. (I'd dare say it's obvious,
> even.)
>
> Richard, any chance you could give it a quick ack?

OK

Re: [PATCH] build: Fix missing variable quotes

[Arthur Cohen]

Hi Collin,

Sorry about the mess. As Sam pointed out, there was already a patch 
proposed in the bugzilla PR which I've posted on the ML as well for 
review. The only difference with your patch is that it also changes 
ac_cv_search_pthread_crate to ac_cv_search_pthread_create, as otherwise 
the check will always be false.

Best,

Arthur

On 6/14/24 02:53, Collin Funk wrote:
> When dlopen and pthread_create are in libc the variable is
> set to "none required", therefore running configure will show
> the following errors:
> 
> ./configure: line 8997: test: too many arguments
> ./configure: line 8999: test: too many arguments
> ./configure: line 9003: test: too many arguments
> ./configure: line 9005: test: =: unary operator expected
> 
> ChangeLog:
> 
> 	* configure.ac: Quote variable result of AC_SEARCH_LIBS.
>          * configure: Regenerate.
> 
> Signed-off-by: Collin Funk <collin.funk1@gmail.com>
> ---
>   configure    | 10 +++++-----
>   configure.ac |  8 ++++----
>   2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/configure b/configure
> index 51576a41f30..6e95b27d9df 100755
> --- a/configure
> +++ b/configure
> @@ -8994,15 +8994,15 @@ if test "$ac_res" != no; then :
>   fi
>   
>   
> -if test $ac_cv_search_dlopen = -ldl; then
> +if test "$ac_cv_search_dlopen" = -ldl; then
>       CRAB1_LIBS="$CRAB1_LIBS -ldl"
> -elif test $ac_cv_search_dlopen = no; then
> +elif test "$ac_cv_search_dlopen" = no; then
>       missing_rust_dynlibs="libdl"
>   fi
>   
> -if test $ac_cv_search_pthread_create = -lpthread; then
> +if test "$ac_cv_search_pthread_create" = -lpthread; then
>       CRAB1_LIBS="$CRAB1_LIBS -lpthread"
> -elif test $ac_cv_search_pthread_crate = no; then
> +elif test "$ac_cv_search_pthread_crate" = no; then
>       missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
>   fi
>   
> @@ -19746,7 +19746,7 @@ config.status
>   configured by $0, generated by GNU Autoconf 2.69,
>     with options \\"\$ac_cs_config\\"
>   
> -Copyright (C) 2012 Free Software Foundation, Inc.
> +Copyright (C)  Free Software Foundation, Inc.
>   This config.status script is free software; the Free Software Foundation
>   gives unlimited permission to copy, distribute and modify it."
>   
> diff --git a/configure.ac b/configure.ac
> index 5eda8dcdbf7..88576b31bfc 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2045,15 +2045,15 @@ missing_rust_dynlibs=none
>   AC_SEARCH_LIBS([dlopen], [dl])
>   AC_SEARCH_LIBS([pthread_create], [pthread])
>   
> -if test $ac_cv_search_dlopen = -ldl; then
> +if test "$ac_cv_search_dlopen" = -ldl; then
>       CRAB1_LIBS="$CRAB1_LIBS -ldl"
> -elif test $ac_cv_search_dlopen = no; then
> +elif test "$ac_cv_search_dlopen" = no; then
>       missing_rust_dynlibs="libdl"
>   fi
>   
> -if test $ac_cv_search_pthread_create = -lpthread; then
> +if test "$ac_cv_search_pthread_create" = -lpthread; then
>       CRAB1_LIBS="$CRAB1_LIBS -lpthread"
> -elif test $ac_cv_search_pthread_crate = no; then
> +elif test "$ac_cv_search_pthread_crate" = no; then
>       missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
>   fi
>