From b558ff043d41ba8d17a82f5f9ae5f9dade66160e Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Sat, 25 Jul 2015 11:14:34 -0400 Subject: [PATCH] Don't build readline's shared libs by default Since the sync to version 7.0-alpho, readline now by default builds (unused) shared libraries alongside static libraries, whereas before it only built static libraries. A couple of GDB buildbots were not happy with this change: http://gdb-build.sergiodj.net/builders/AIX-POWER7-plain/builds/240 http://gdb-build.sergiodj.net/builders/Fedora-i686/builds/1518 To get these buildbots building again, this patch alters readline's configure.ac file to not build shared libraries by default, as was the case with readline 6.2. A more permanent fix may be to alter the top-level Makefile.def to pass --disable-shared to readline, or to investigate why these building these shared libraries are giving the buildbots trouble. (I think the proximate reason why the i686 buildbot fails is because it passes CFLAGS=-m32 instead of CC="gcc -m32" to the top-level configure script, and readline's linker commands don't inherit CFLAGS. Not sure about the AIX failure.) readline/ChangeLog.gdb: * configure.ac: Default opt_shared_libs to no. * configure: Regenerate. --- readline/ChangeLog.gdb | 5 +++++ readline/configure | 2 +- readline/configure.ac | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb index 2a9a1b26518..013727da6bc 100644 --- a/readline/ChangeLog.gdb +++ b/readline/ChangeLog.gdb @@ -1,3 +1,8 @@ +2015-07-25 Patrick Palka + + * configure.ac: Default opt_shared_libs to no. + * configure: Regenerate. + 2015-07-25 Patrick Palka Import readline 7.0 alpha diff --git a/readline/configure b/readline/configure index 3af8fbe1a3e..813e3797e45 100755 --- a/readline/configure +++ b/readline/configure @@ -2352,7 +2352,7 @@ fi opt_multibyte=yes opt_static_libs=yes -opt_shared_libs=yes +opt_shared_libs=no # Check whether --enable-multibyte was given. if test "${enable_multibyte+set}" = set; then : diff --git a/readline/configure.ac b/readline/configure.ac index 42e21fa475e..b4fa645e866 100644 --- a/readline/configure.ac +++ b/readline/configure.ac @@ -58,7 +58,7 @@ fi dnl option parsing for optional features opt_multibyte=yes opt_static_libs=yes -opt_shared_libs=yes +opt_shared_libs=no AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval) AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval) -- 2.30.2