From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id B6C193850876 for ; Thu, 20 Oct 2022 15:05:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B6C193850876 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E30AB22969 for ; Thu, 20 Oct 2022 15:05:58 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C33EA13AF5 for ; Thu, 20 Oct 2022 15:05:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kiKHLtZjUWOMeQAAMHmgww (envelope-from ) for ; Thu, 20 Oct 2022 15:05:58 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] Reapply "Don't build readline/libreadline.a, when --with-system-readline is supplied" Date: Thu, 20 Oct 2022 17:05:58 +0200 Message-Id: <20221020150558.32362-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2022 15:06:04 -0000 From: Дилян Палаузов 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. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=18632 --- 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 = 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 + # Check whether --with-zstd was given. if test "${with_zstd+set}" = 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 = 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 + AC_ARG_WITH(zstd, [AS_HELP_STRING([--with-zstd], [Support zstd compressed debug sections (default=auto)])]) base-commit: 837e225ba1992f9745e5bbbd5e8443243a7f475f -- 2.35.3