Message ID | 20240619234020.35486-2-collin.funk1@gmail.com |
---|---|
State | New |
Headers | show |
Series | build: Fix missing variable quotes and typo | expand |
Collin Funk <collin.funk1@gmail.com> 于2024年6月20日周四 07:40写道: > > I've just fixed the quotes and that typo in one patch. I hope you don't > mind. When using Autoconf 2.69 and Automake 1.15.1 that copyright diff > goes away. I'm not familiar with the gcc-autoregen bot but I think this > should make it happy. > > -- >8 -- > > 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: > > PR bootstrap/115453 > * configure.ac: Quote variable result of AC_SEARCH_LIBS. Fix > typo ac_cv_search_pthread_crate. > * configure: Regenerate. > > Signed-off-by: Collin Funk <collin.funk1@gmail.com> > --- I committed it. And if you are using git format-patch, you can add -V2/-V3/-V4 option if you are resending a updated patch.
diff --git a/configure b/configure index 51576a41f30..51bf1d1add1 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_create" = no; then missing_rust_dynlibs="$missing_rust_dynlibs, libpthread" fi diff --git a/configure.ac b/configure.ac index 5eda8dcdbf7..20457005e29 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_create" = no; then missing_rust_dynlibs="$missing_rust_dynlibs, libpthread" fi
I've just fixed the quotes and that typo in one patch. I hope you don't mind. When using Autoconf 2.69 and Automake 1.15.1 that copyright diff goes away. I'm not familiar with the gcc-autoregen bot but I think this should make it happy. -- >8 -- 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: PR bootstrap/115453 * configure.ac: Quote variable result of AC_SEARCH_LIBS. Fix typo ac_cv_search_pthread_crate. * configure: Regenerate. Signed-off-by: Collin Funk <collin.funk1@gmail.com> --- configure | 8 ++++---- configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)