From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5758 invoked by alias); 1 Feb 2020 20:38:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 5750 invoked by uid 89); 1 Feb 2020 20:38:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-delivery-1.mimecast.com Received: from us-smtp-2.mimecast.com (HELO us-smtp-delivery-1.mimecast.com) (205.139.110.61) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 01 Feb 2020 20:38:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580589484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N6uNX9I/TeBvJrRFAI2o4c5CrnVSQ2MT0KeQZb3Z8Ww=; b=fCM0a5m5Vj63jKO7TbCMkFR/Fw9GYLauJ/C/iD2N0dAgsZLdgbBm7DTbg4fNqiTFVtIIG/ Rf6YRMpLSip2Jqh3QQs4t6yQj+9eZhc2Af9+wKzVV8bzNi4r4elhe5MZlc98ux8pGcvaNm DT3QQE7kJSEg3DNE8gUWwuYQYZ4IL1M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-ZC7zu9DtO4SvRKm3NAzoJw-1; Sat, 01 Feb 2020 15:37:56 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CEDCA189F760; Sat, 1 Feb 2020 20:37:54 +0000 (UTC) Received: from localhost (unused-10-15-17-196.yyz.redhat.com [10.15.17.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id D01AA5DC18; Sat, 1 Feb 2020 20:37:53 +0000 (UTC) From: Sergio Durigan Junior To: Joel Brobecker Cc: Eli Zaretskii , simark@simark.ca, gdb-patches@sourceware.org, tom@tromey.com Subject: Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree References: <20200105073000.1012-1-brobecker@adacore.com> <4d350c75-6e52-5c4c-5901-4c391970b643@simark.ca> <20200117181554.GB7007@adacore.com> <20200117183203.GC7007@adacore.com> <87imksmz79.fsf@redhat.com> <834kwcm63u.fsf@gnu.org> <87r1zflbft.fsf@redhat.com> <87eevfl2ze.fsf@redhat.com> <20200201101940.GB19442@adacore.com> <20200201102647.GC19442@adacore.com> Date: Sat, 01 Feb 2020 20:38:00 -0000 In-Reply-To: <20200201102647.GC19442@adacore.com> (Joel Brobecker's message of "Sat, 1 Feb 2020 14:26:47 +0400") Message-ID: <87k156hwm6.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00027.txt.bz2 On Saturday, February 01 2020, Joel Brobecker wrote: >> > >>> I'm wondering what to do here. I think I found a hacky and ugly >> > >>> solution here, but I'm trying to see if there's a better approach. >> > >> >> > >> A special command-line switch to 'configure', to be used by >> > >> src-release.sh? >> > > >> > > A quick attempt here didn't really work. The script is able to fini= sh >> > > the build and create a tarball, but for some reason the gdb director= y is >> > > not configured/built. >> >=20 >> > OK, I think I have something that works. When 'configure' is invoked >> > with '--enable-src-release-build', a tarball is generated and, as far = as >> > I have checked, contains the correct snapshot. >> >=20 >> > WDYT? >>=20 >> Thanks! I didn't realize that this would impact source packaging >> like that. >>=20 >> Let's go with your patch. I'm about to start working on the release, >> so I'll apply it for you. > > Or not. Jonah just reported another blocking issue :-(, so I won't > be creating this release this weekend. > > So the "good" news is that you can push the patch yourself! Thanks for the quick review, Joel :-). Below is what I pushed. Cheers, --=20 Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/ =46rom 1aa93c3a9b9a216703aaf882b3af541f3bc3042a Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Sat, 1 Feb 2020 15:33:31 -0500 Subject: [PATCH] Implement '--enable-src-release-build' option and make src-release.sh use it The generation of snapshots has been broken since we've disable in-tree builds for GDB. Given that src-release.sh performs a build before creating the release tarball, and that this build is performed in-tree, the solution we found is to implement a new top-level configure flag called '--enable-src-release-build' which disables the in-tree build restriction, and then make src-release.sh use it. ChangeLog: 2020-02-01 Sergio Durigan Junior Eli Zaretskii * configure.ac: Don't abort the build if trying to build GDB in tree _and_ invoking with '--enable-src-release-build'. * configure: Regenerate. * src-release.sh (do_proto_toplev): Invoke 'configure' using Change-Id: Ic6dd55accd9a03e62fe498f7fd704fb67f44bfa9 --- ChangeLog | 8 ++++++++ configure | 2 +- configure.ac | 2 +- src-release.sh | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bfe989885..211451345e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-02-01 Sergio Durigan Junior + + * configure.ac: Don't abort the build if trying to build GDB in tree + _and_ invoking with '--enable-src-release-build'. + * configure: Regenerate. + * src-release.sh (do_proto_toplev): Invoke 'configure' using + '--enable-src-release-build'. + 2020-01-17 Joel Brobecker =20 * configure.ac: Abort the build with an error if trying to build diff --git a/configure b/configure index 7168a4e90e..276f33fee3 100755 --- a/configure +++ b/configure @@ -2279,7 +2279,7 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu =20 =20 =20 -if test x"${enable_gdb}" !=3D x"no"; then +if test x"${enable_gdb}" !=3D x"no" -a x"${enable_src_release_build}" !=3D= x"yes"; then # For this branch, we do not support building GDB in-tree. # Try to detect whether we are in this situation or not by # searching for a couple of known files in the source directory. diff --git a/configure.ac b/configure.ac index e5ca1eaa57..cd0867dd76 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ m4_include([config/isl.m4]) AC_INIT(move-if-change) AC_DISABLE_OPTION_CHECKING =20 -if test x"${enable_gdb}" !=3D x"no"; then +if test x"${enable_gdb}" !=3D x"no" -a x"${enable_src_release_build}" !=3D= x"yes"; then # For this branch, we do not support building GDB in-tree. # Try to detect whether we are in this situation or not by # searching for a couple of known files in the source directory. diff --git a/src-release.sh b/src-release.sh index 275f0f24b5..68e824c749 100755 --- a/src-release.sh +++ b/src-release.sh @@ -99,8 +99,8 @@ do_proto_toplev() *) disables=3D"$disables --disable-$dir" ;; esac done - echo "=3D=3D> configure --target=3Di386-pc-linux-gnu $disables $enable= s" - ./configure --target=3Di386-pc-linux-gnu $disables $enables + echo "=3D=3D> configure --target=3Di386-pc-linux-gnu --enable-src-rele= ase-build=3Dyes $disables $enables" + ./configure --target=3Di386-pc-linux-gnu --enable-src-release-build=3D= yes $disables $enables $MAKE configure-host configure-target \ ALL_GCC=3D"" ALL_GCC_C=3D"" ALL_GCC_CXX=3D"" \ CC_FOR_TARGET=3D"$CC" CXX_FOR_TARGET=3D"$CXX" --=20 2.21.0