gdb: fix builds with internal readline and no static libraries

If gdb was configured to use the internal readline but static libraries were
disabled, gdb wouldn't dutifully not build libreadline.a which was a problem
when it tried to link with that library.

Solve this by ensuring --enable-static is passed to the readline configure.

(From OE-Core rev: 1490caa07d72af81c7e515e4ff7b4905da840d7d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2016-03-03 21:01:13 +00:00 committed by Richard Purdie
parent 6518db4707
commit 37f5fb944a
2 changed files with 38 additions and 0 deletions

View File

@ -7,6 +7,7 @@ SRC_URI += "file://0002-Change-order-of-CFLAGS.patch \
file://0001-Use-exported-definitions-of-SIGRTMIN.patch \
file://0001-include-sys-types.h-for-mode_t.patch \
file://0001-use-asm-sgidefs.h.patch \
file://force-readline-static.patch \
"
#LDFLAGS_append = " -s"
#export CFLAGS_append=" -L${STAGING_LIBDIR}"

View File

@ -0,0 +1,37 @@
If gdb is configured with --disable-static then this is dutifully passed to
readline which then disables libreadline.a, which causes a problem when gdb
tries to link against that.
To ensure that readline always builds static libraries, pass --enable-static to
the sub-configure.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/Makefile.def b/Makefile.def
index 4394188..05c661a 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -100,7 +100,8 @@ host_modules= { module= libiconv;
missing= install-html;
missing= install-info; };
host_modules= { module= m4; };
-host_modules= { module= readline; };
+host_modules= { module= readline;
+ extra_configure_flags='--enable-static';};
host_modules= { module= sid; };
host_modules= { module= sim; };
host_modules= { module= texinfo; no_install= true; };
diff --git a/Makefile.in b/Makefile.in
index 61e0ab6..837f36e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24971,7 +24971,7 @@ configure-readline:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} \
+ --target=${target_alias} --enable-static \
|| exit 1
@endif readline