0003-Dont-disable-libreadline.a-when-using-disable-static.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From 431a88f4370a23b297998641e1e10ebfd74478d9 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Sat, 30 Apr 2016 15:25:03 -0700
  4. Subject: [PATCH] Dont disable libreadline.a when using --disable-static
  5. If gdb is configured with --disable-static then this is dutifully passed to
  6. readline which then disables libreadline.a, which causes a problem when gdb
  7. tries to link against that.
  8. To ensure that readline always builds static libraries, pass --enable-static to
  9. the sub-configure.
  10. Upstream-Status: Pending
  11. Signed-off-by: Ross Burton <ross.burton@intel.com>
  12. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  13. ---
  14. Makefile.def | 3 ++-
  15. Makefile.in | 2 +-
  16. 2 files changed, 3 insertions(+), 2 deletions(-)
  17. diff --git a/Makefile.def b/Makefile.def
  18. index f974565d8ca..039b5a3c209 100644
  19. --- a/Makefile.def
  20. +++ b/Makefile.def
  21. @@ -120,7 +120,8 @@ host_modules= { module= libiconv;
  22. missing= install-html;
  23. missing= install-info; };
  24. host_modules= { module= m4; };
  25. -host_modules= { module= readline; };
  26. +host_modules= { module= readline;
  27. + extra_configure_flags='--enable-static';};
  28. host_modules= { module= sid; };
  29. host_modules= { module= sim; };
  30. host_modules= { module= texinfo; no_install= true; };
  31. diff --git a/Makefile.in b/Makefile.in
  32. index a425b54e094..dfaf585a7c1 100644
  33. --- a/Makefile.in
  34. +++ b/Makefile.in
  35. @@ -32816,7 +32816,7 @@ configure-readline:
  36. $$s/$$module_srcdir/configure \
  37. --srcdir=$${topdir}/$$module_srcdir \
  38. $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
  39. - --target=${target_alias} \
  40. + --target=${target_alias} --enable-static \
  41. || exit 1
  42. @endif readline