From 5c92ebd5e117e4cf118c984171e0703dfcfb8cd8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Apr 2016 15:25:03 -0700 Subject: [PATCH 06/10] Dont disable libreadline.a when using --disable-static 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 Signed-off-by: Khem Raj --- Makefile.def | 3 ++- Makefile.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.def b/Makefile.def index 0d13f037d0..8bcd86e13f 100644 --- a/Makefile.def +++ b/Makefile.def @@ -105,7 +105,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 3acb83b8de..e348907128 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25470,7 +25470,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 -- 2.13.1