From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id D1E6D3858D39; Fri, 21 Oct 2022 06:52:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1E6D3858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666335133; bh=lf281t0vRDGiZnTmmJ4POi39lmp+n3CJtgZMxVmUosA=; h=From:To:Subject:Date:From; b=WuTDzKnb/IhUYlY0H6XuIemkUbUpr5EzxFf791SWQJZ6gI8ZESrlDwXED1QhYF78R Y5k7p/gFB7rtg4lTWD3tvo4LBxWw1V2MZsAfdnjI09fQrwZxkiDU0/xpC0Guxx0F4y B21pYF+nNZsvX53qVWfKfmpwInlh1uF9oZJDmAgQ= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Tom de Vries To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3428] Don't build readline/libreadline.a, when --with-system-readline is supplied X-Act-Checkin: gcc X-Git-Author: =?utf-8?b?0JTQuNC70Y/QvSDQn9Cw0LvQsNGD0LfQvtCy?= X-Git-Refname: refs/heads/master X-Git-Oldrev: f56d48b2471c388401174029324e1f4c4b84fcdb X-Git-Newrev: 36ba985145ffa8e2078033fc1f1cf22851707a8e Message-Id: <20221021065213.D1E6D3858D39@sourceware.org> Date: Fri, 21 Oct 2022 06:52:13 +0000 (GMT) List-Id: https://gcc.gnu.org/g:36ba985145ffa8e2078033fc1f1cf22851707a8e commit r13-3428-g36ba985145ffa8e2078033fc1f1cf22851707a8e Author: Дилян Палаузов Date: Thu Oct 20 17:05:04 2022 +0200 Don't build readline/libreadline.a, when --with-system-readline is supplied https://sourceware.org/bugzilla/show_bug.cgi?id=18632 The bundled libreadline is always built, even if the system is ./configure'd --with-system-readline and the build libreadline.a is not used. Proposed patch: Fix ./configure.ac not to proceed readline/, when --with-system- readline is provided * configure.ac: Don't configure readline if --with-system-readline is used. * configure: Re-generate. Diff: --- configure | 6 ++++++ configure.ac | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/configure b/configure index d9aa84c6138..007a77a5f6c 100755 --- a/configure +++ b/configure @@ -2946,6 +2946,12 @@ if test x$with_system_zlib = xyes ; then noconfigdirs="$noconfigdirs zlib" fi +# Don't compile the bundled readline/libreadline.a if --with-system-readline +# is provided. +if test x$with_system_readline = xyes ; then + noconfigdirs="$noconfigdirs readline" +fi + # some tools are so dependent upon X11 that if we're not building with X, # it's not even worth trying to configure, much less build, that tool. diff --git a/configure.ac b/configure.ac index 2cff32e300e..1df410bba1f 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,12 @@ if test x$with_system_zlib = xyes ; then noconfigdirs="$noconfigdirs zlib" fi +# Don't compile the bundled readline/libreadline.a if --with-system-readline +# is provided. +if test x$with_system_readline = xyes ; then + noconfigdirs="$noconfigdirs readline" +fi + # some tools are so dependent upon X11 that if we're not building with X, # it's not even worth trying to configure, much less build, that tool.