* [PATCH] sim: Fix autoreconf errors in sim/ directory
@ 2020-10-05 17:13 Andrew Burgess
2020-10-05 18:01 ` Simon Marchi
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Burgess @ 2020-10-05 17:13 UTC (permalink / raw)
To: gdb-patches
Run autoreconf in sim/ directory and you'll see some errors. The
problem is that autoreconf (a perl script) does not evaluate the value
passed as an argument to AC_CONFIG_AUX_DIR, so something like:
AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
does not do the right thing inside autoreconf, my understanding is
that changing to something like this is fine:
AC_CONFIG_AUX_DIR(../..)
the generated configure seems to check the value passed, and the value
passed relative to the source directory, so I think we get basically
the same behaviour as before.
sim/testsuite/ChangeLog:
* configure: Regnerate.
* configure.ac (AC_CONFIG_AUX_DIR): Update.
sim/testsuite/d10v-elf/ChangeLog:
* configure: Regnerate.
* configure.ac (AC_CONFIG_AUX_DIR): Update.
sim/testsuite/frv-elf/ChangeLog:
* configure: Regnerate.
* configure.ac (AC_CONFIG_AUX_DIR): Update.
sim/testsuite/m32r-elf/ChangeLog:
* configure: Regnerate.
* configure.ac (AC_CONFIG_AUX_DIR): Update.
sim/testsuite/mips64el-elf/ChangeLog:
* configure: Regnerate.
* configure.ac (AC_CONFIG_AUX_DIR): Update.
---
sim/testsuite/ChangeLog | 5 +++++
sim/testsuite/configure | 4 ++--
sim/testsuite/configure.ac | 2 +-
sim/testsuite/d10v-elf/ChangeLog | 5 +++++
sim/testsuite/d10v-elf/configure | 4 ++--
sim/testsuite/d10v-elf/configure.ac | 2 +-
sim/testsuite/frv-elf/ChangeLog | 5 +++++
sim/testsuite/frv-elf/configure | 4 ++--
sim/testsuite/frv-elf/configure.ac | 2 +-
sim/testsuite/m32r-elf/ChangeLog | 5 +++++
sim/testsuite/m32r-elf/configure | 4 ++--
sim/testsuite/m32r-elf/configure.ac | 2 +-
sim/testsuite/mips64el-elf/ChangeLog | 5 +++++
sim/testsuite/mips64el-elf/configure | 4 ++--
sim/testsuite/mips64el-elf/configure.ac | 2 +-
15 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/sim/testsuite/configure b/sim/testsuite/configure
index c3674c2fa07..6f0464dc14a 100755
--- a/sim/testsuite/configure
+++ b/sim/testsuite/configure
@@ -1688,7 +1688,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC=${CC-cc}
ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../.. "$srcdir"/`cd $srcdir;pwd`/../..; do
+for ac_dir in ../.. "$srcdir"/../..; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1704,7 +1704,7 @@ for ac_dir in `cd $srcdir;pwd`/../.. "$srcdir"/`cd $srcdir;pwd`/../..; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../.." "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac
index 5d753879ad0..faaf38dc887 100644
--- a/sim/testsuite/configure.ac
+++ b/sim/testsuite/configure.ac
@@ -8,7 +8,7 @@ AC_INIT(common/bits-tst.c)
CC=${CC-cc}
AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
+AC_CONFIG_AUX_DIR(../..)
AC_CANONICAL_SYSTEM
# Configure sub-directory for appropriate targets
diff --git a/sim/testsuite/d10v-elf/configure b/sim/testsuite/d10v-elf/configure
index 27f3cf4cffe..5686b7e4eb2 100755
--- a/sim/testsuite/d10v-elf/configure
+++ b/sim/testsuite/d10v-elf/configure
@@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC=${CC-cc}
ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
+for ac_dir in ../../.. "$srcdir"/../../..; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
diff --git a/sim/testsuite/d10v-elf/configure.ac b/sim/testsuite/d10v-elf/configure.ac
index 40e1c124e85..278d84d0e82 100644
--- a/sim/testsuite/d10v-elf/configure.ac
+++ b/sim/testsuite/d10v-elf/configure.ac
@@ -9,7 +9,7 @@ AC_INIT(Makefile.in)
CC=${CC-cc}
AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
+AC_CONFIG_AUX_DIR(../../..)
AC_CANONICAL_SYSTEM
AC_SUBST(target_cpu)
diff --git a/sim/testsuite/frv-elf/configure b/sim/testsuite/frv-elf/configure
index 27f3cf4cffe..5686b7e4eb2 100755
--- a/sim/testsuite/frv-elf/configure
+++ b/sim/testsuite/frv-elf/configure
@@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC=${CC-cc}
ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
+for ac_dir in ../../.. "$srcdir"/../../..; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
diff --git a/sim/testsuite/frv-elf/configure.ac b/sim/testsuite/frv-elf/configure.ac
index 40e1c124e85..278d84d0e82 100644
--- a/sim/testsuite/frv-elf/configure.ac
+++ b/sim/testsuite/frv-elf/configure.ac
@@ -9,7 +9,7 @@ AC_INIT(Makefile.in)
CC=${CC-cc}
AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
+AC_CONFIG_AUX_DIR(../../..)
AC_CANONICAL_SYSTEM
AC_SUBST(target_cpu)
diff --git a/sim/testsuite/m32r-elf/configure b/sim/testsuite/m32r-elf/configure
index 27f3cf4cffe..5686b7e4eb2 100755
--- a/sim/testsuite/m32r-elf/configure
+++ b/sim/testsuite/m32r-elf/configure
@@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC=${CC-cc}
ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
+for ac_dir in ../../.. "$srcdir"/../../..; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
diff --git a/sim/testsuite/m32r-elf/configure.ac b/sim/testsuite/m32r-elf/configure.ac
index 40e1c124e85..278d84d0e82 100644
--- a/sim/testsuite/m32r-elf/configure.ac
+++ b/sim/testsuite/m32r-elf/configure.ac
@@ -9,7 +9,7 @@ AC_INIT(Makefile.in)
CC=${CC-cc}
AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
+AC_CONFIG_AUX_DIR(../../..)
AC_CANONICAL_SYSTEM
AC_SUBST(target_cpu)
diff --git a/sim/testsuite/mips64el-elf/configure b/sim/testsuite/mips64el-elf/configure
index 27f3cf4cffe..5686b7e4eb2 100755
--- a/sim/testsuite/mips64el-elf/configure
+++ b/sim/testsuite/mips64el-elf/configure
@@ -1682,7 +1682,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CC=${CC-cc}
ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
+for ac_dir in ../../.. "$srcdir"/../../..; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1698,7 +1698,7 @@ for ac_dir in `cd $srcdir;pwd`/../../.. "$srcdir"/`cd $srcdir;pwd`/../../..; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`cd $srcdir;pwd\`/../../.. \"$srcdir\"/\`cd $srcdir;pwd\`/../../.." "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
diff --git a/sim/testsuite/mips64el-elf/configure.ac b/sim/testsuite/mips64el-elf/configure.ac
index 40e1c124e85..278d84d0e82 100644
--- a/sim/testsuite/mips64el-elf/configure.ac
+++ b/sim/testsuite/mips64el-elf/configure.ac
@@ -9,7 +9,7 @@ AC_INIT(Makefile.in)
CC=${CC-cc}
AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
+AC_CONFIG_AUX_DIR(../../..)
AC_CANONICAL_SYSTEM
AC_SUBST(target_cpu)
--
2.25.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] sim: Fix autoreconf errors in sim/ directory
2020-10-05 17:13 [PATCH] sim: Fix autoreconf errors in sim/ directory Andrew Burgess
@ 2020-10-05 18:01 ` Simon Marchi
0 siblings, 0 replies; 2+ messages in thread
From: Simon Marchi @ 2020-10-05 18:01 UTC (permalink / raw)
To: Andrew Burgess, gdb-patches
On 2020-10-05 1:13 p.m., Andrew Burgess wrote:
> Run autoreconf in sim/ directory and you'll see some errors. The
> problem is that autoreconf (a perl script) does not evaluate the value
> passed as an argument to AC_CONFIG_AUX_DIR, so something like:
>
> AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
>
> does not do the right thing inside autoreconf, my understanding is
> that changing to something like this is fine:
>
> AC_CONFIG_AUX_DIR(../..)
>
> the generated configure seems to check the value passed, and the value
> passed relative to the source directory, so I think we get basically
> the same behaviour as before.
>
> sim/testsuite/ChangeLog:
>
> * configure: Regnerate.
> * configure.ac (AC_CONFIG_AUX_DIR): Update.
>
> sim/testsuite/d10v-elf/ChangeLog:
>
> * configure: Regnerate.
> * configure.ac (AC_CONFIG_AUX_DIR): Update.
>
> sim/testsuite/frv-elf/ChangeLog:
>
> * configure: Regnerate.
> * configure.ac (AC_CONFIG_AUX_DIR): Update.
>
> sim/testsuite/m32r-elf/ChangeLog:
>
> * configure: Regnerate.
> * configure.ac (AC_CONFIG_AUX_DIR): Update.
>
> sim/testsuite/mips64el-elf/ChangeLog:
>
> * configure: Regnerate.
> * configure.ac (AC_CONFIG_AUX_DIR): Update.
Looking at the generates configure files, I think that it's good.
Simon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-05 18:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-05 17:13 [PATCH] sim: Fix autoreconf errors in sim/ directory Andrew Burgess
2020-10-05 18:01 ` Simon Marchi
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 read-only IMAP folder(s) and NNTP newsgroup(s).