blob: 8b1395810122f2dea0740f8475ff73d63fa3afc3 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 5c92ebd5e117e4cf118c984171e0703dfcfb8cd8 Mon Sep 17 00:00:00 2001
Patrick Williamsc0f7c042017-02-23 20:41:17 -06002From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:25:03 -0700
4Subject: [PATCH 06/10] Dont disable libreadline.a when using --disable-static
5
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
Brad Bishopd7bf8c12018-02-25 22:55:05 -050022index 0d13f037d0..8bcd86e13f 100644
Patrick Williamsc0f7c042017-02-23 20:41:17 -060023--- a/Makefile.def
24+++ b/Makefile.def
Brad Bishopd7bf8c12018-02-25 22:55:05 -050025@@ -105,7 +105,8 @@ host_modules= { module= libiconv;
Patrick Williamsc0f7c042017-02-23 20:41:17 -060026 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
Brad Bishopd7bf8c12018-02-25 22:55:05 -050036index 3acb83b8de..e348907128 100644
Patrick Williamsc0f7c042017-02-23 20:41:17 -060037--- a/Makefile.in
38+++ b/Makefile.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050039@@ -25470,7 +25470,7 @@ configure-readline:
Patrick Williamsc0f7c042017-02-23 20:41:17 -060040 $$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
48--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500492.13.1
Patrick Williamsc0f7c042017-02-23 20:41:17 -060050