blob: a1e85e91b336d9200c3bba389920679da18c50ee [file] [log] [blame]
Andrew Geisslerd5838332022-05-27 11:33:10 -05001From 15ee6a626242efb8f367be49c13e00d0b72317f0 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:25:03 -0700
Andrew Geisslerd5838332022-05-27 11:33:10 -05004Subject: [PATCH 4/9] Dont disable libreadline.a when using --disable-static
Andrew Geissler82c905d2020-04-13 13:39:40 -05005
6If gdb is configured with --disable-static then this is dutifully passed to
7readline which then disables libreadline.a, which causes a problem when gdb
8tries to link against that.
9
10To ensure that readline always builds static libraries, pass --enable-static to
11the sub-configure.
12
13Upstream-Status: Pending
14Signed-off-by: Ross Burton <ross.burton@intel.com>
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 Makefile.def | 3 ++-
18 Makefile.in | 2 +-
19 2 files changed, 3 insertions(+), 2 deletions(-)
20
21diff --git a/Makefile.def b/Makefile.def
Andrew Geisslerd5838332022-05-27 11:33:10 -050022index acdcd625ed6..78fc31e1199 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050023--- a/Makefile.def
24+++ b/Makefile.def
Andrew Geisslerd5838332022-05-27 11:33:10 -050025@@ -120,7 +120,8 @@ host_modules= { module= libiconv;
Andrew Geissler82c905d2020-04-13 13:39:40 -050026 missing= install-html;
27 missing= install-info; };
28 host_modules= { module= m4; };
29-host_modules= { module= readline; };
30+host_modules= { module= readline;
31+ extra_configure_flags='--enable-static';};
32 host_modules= { module= sid; };
33 host_modules= { module= sim; };
34 host_modules= { module= texinfo; no_install= true; };
35diff --git a/Makefile.in b/Makefile.in
Andrew Geisslerd5838332022-05-27 11:33:10 -050036index 3aacd2daac9..aa58adada4a 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050037--- a/Makefile.in
38+++ b/Makefile.in
Andrew Geisslerd5838332022-05-27 11:33:10 -050039@@ -32791,7 +32791,7 @@ configure-readline:
Andrew Geissler82c905d2020-04-13 13:39:40 -050040 $$s/$$module_srcdir/configure \
41 --srcdir=$${topdir}/$$module_srcdir \
42 $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
43- --target=${target_alias} \
44+ --target=${target_alias} --enable-static \
45 || exit 1
46 @endif readline
47
Andrew Geissler6ce62a22020-11-30 19:58:47 -060048--
Andrew Geisslerd5838332022-05-27 11:33:10 -0500492.36.1
Andrew Geissler6ce62a22020-11-30 19:58:47 -060050