MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust location of readline in sim/erc32

Browse Source 
sim/erc32 uses an obsolete path to the in-tree build of readline.
readline was moved into a subdirectory some time ago.  This patch
fixes the problem.  Tested by rebuilding.

sim/erc32/ChangeLog
2021-04-05  Tom Tromey  <tromey@adacore.com>

	* configure: Rebuild.
	* configure.ac (READLINE): Adjust in-tree value.
This commit is contained in:
Tom Tromey 2021-04-05 06:53:35 -06:00
parent c774eab1c8
commit 53e123a578
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/erc32/ChangeLog
View File

@ -1,3 +1,8 @@
2021-04-05 Tom Tromey <tromey@adacore.com>
* configure: Rebuild.
* configure.ac (READLINE): Adjust in-tree value.
2021-04-02 Mike Frysinger <vapier@gentoo.org> 2021-04-02 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, configure: Regenerate. * aclocal.m4, configure: Regenerate.

2
sim/erc32/configure vendored
View File

@ -12070,7 +12070,7 @@ fi
# We prefer the in-tree readline. Top-level dependencies make sure # We prefer the in-tree readline. Top-level dependencies make sure
# src/readline (if it's there) is configured before src/sim. # src/readline (if it's there) is configured before src/sim.
if test -r ../../readline/Makefile; then if test -r ../../readline/Makefile; then
READLINE=../../readline/libreadline.a READLINE=../../readline/readline/libreadline.a
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
$as_echo_n "checking for readline in -lreadline... " >&6; } $as_echo_n "checking for readline in -lreadline... " >&6; }

2
sim/erc32/configure.ac
View File

@ -38,7 +38,7 @@ AC_SUBST(TERMCAP)
# We prefer the in-tree readline. Top-level dependencies make sure # We prefer the in-tree readline. Top-level dependencies make sure
# src/readline (if it's there) is configured before src/sim. # src/readline (if it's there) is configured before src/sim.
if test -r ../../readline/Makefile; then if test -r ../../readline/Makefile; then
READLINE=../../readline/libreadline.a READLINE=../../readline/readline/libreadline.a
else else
AC_CHECK_LIB(readline, readline, READLINE=-lreadline, AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
AC_ERROR([the required "readline" library is missing]), $TERMCAP) AC_ERROR([the required "readline" library is missing]), $TERMCAP)