From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 188983850205; Thu, 20 Oct 2022 15:05:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 188983850205 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666278308; bh=TJVibd7L/48r+b8ekFeHV+u1e70VMMZ9Q5zKyMhHz0w=; h=From:To:Subject:Date:From; b=Ij5ob+RxpYosqlH+8euWERXr3b/pH8AFOPgFZSQQT1cUHC9kgw1b10hLuM4qgjxdI f0/qF37eYveLd1o85q34/5bToHWG6+RNuYc/FwftLajQyoK6fb2LCdzNA81aypgNvk Ud4zp78T2lQi0VZDUY/xZIoBjgBbLq7gYXscTvjo= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] Reapply "Don't build readline/libreadline.a, when --with-system-readline is supplied" X-Act-Checkin: binutils-gdb X-Git-Author: =?utf-8?b?0JTQuNC70Y/QvSDQn9Cw0LvQsNGD0LfQvtCy?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 837e225ba1992f9745e5bbbd5e8443243a7f475f X-Git-Newrev: 1c232ab030476db2037894600ef5eba9a6de5645 Message-Id: <20221020150508.188983850205@sourceware.org> Date: Thu, 20 Oct 2022 15:05:08 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1c232ab03047= 6db2037894600ef5eba9a6de5645 commit 1c232ab030476db2037894600ef5eba9a6de5645 Author: =D0=94=D0=B8=D0=BB=D1=8F=D0=BD =D0=9F=D0=B0=D0=BB=D0=B0=D1=83=D0=B7= =D0=BE=D0=B2 Date: Thu Oct 20 17:05:04 2022 +0200 Reapply "Don't build readline/libreadline.a, when --with-system-readlin= e is supplied" =20 Commit 228cf97dd3c8 ("Merge configure.ac from gcc project") undid the change originally done in commit 69961a84c9b ("Don't build readline/libreadline.a, when --with-system-readline is supplied"). Re-apply it. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D18632 Diff: --- configure | 6 ++++++ configure.ac | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/configure b/configure index 9ea8034f5d7..7bcb894d1fe 100755 --- a/configure +++ b/configure @@ -2960,6 +2960,12 @@ if test x$with_system_zlib =3D xyes ; then noconfigdirs=3D"$noconfigdirs zlib" fi =20 +# Don't compile the bundled readline/libreadline.a if --with-system-readli= ne +# is provided. +if test x$with_system_readline =3D xyes ; then + noconfigdirs=3D"$noconfigdirs readline" +fi + =20 # Check whether --with-zstd was given. if test "${with_zstd+set}" =3D set; then : diff --git a/configure.ac b/configure.ac index 8af83cc98d3..aab451467bd 100644 --- a/configure.ac +++ b/configure.ac @@ -248,6 +248,12 @@ if test x$with_system_zlib =3D xyes ; then noconfigdirs=3D"$noconfigdirs zlib" fi =20 +# Don't compile the bundled readline/libreadline.a if --with-system-readli= ne +# is provided. +if test x$with_system_readline =3D xyes ; then + noconfigdirs=3D"$noconfigdirs readline" +fi + AC_ARG_WITH(zstd, [AS_HELP_STRING([--with-zstd], [Support zstd compressed debug sections (de= fault=3Dauto)])])