Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 30 Apr 2016 15:25:03 -0700 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 4 | Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 5 | |
| 6 | If gdb is configured with --disable-static then this is dutifully passed to |
| 7 | readline which then disables libreadline.a, which causes a problem when gdb |
| 8 | tries to link against that. |
| 9 | |
| 10 | To ensure that readline always builds static libraries, pass --enable-static to |
| 11 | the sub-configure. |
| 12 | |
| 13 | Upstream-Status: Pending |
| 14 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 15 | Signed-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 | |
| 21 | diff --git a/Makefile.def b/Makefile.def |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | index 75063b6d12..c27bbe4d28 100644 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 23 | --- a/Makefile.def |
| 24 | +++ b/Makefile.def |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 25 | @@ -105,7 +105,8 @@ host_modules= { module= libiconv; |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 26 | 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; }; |
| 35 | diff --git a/Makefile.in b/Makefile.in |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 36 | index 7814fe745f..3b0dc7cbb0 100644 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 37 | --- a/Makefile.in |
| 38 | +++ b/Makefile.in |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 39 | @@ -25470,7 +25470,7 @@ configure-readline: |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 40 | $$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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 49 | 2.18.0 |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 50 | |