From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UBpOEPSwYV/ELAAA0tVLHw (envelope-from ) for ; Wed, 16 Sep 2020 06:30:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4Fi3CvSwYV81IQAA1q6Kng (envelope-from ) for ; Wed, 16 Sep 2020 06:30:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 51E66940609 for ; Wed, 16 Sep 2020 06:30:11 +0000 (UTC) Received: from localhost ([::1]:57306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIQxF-0004IT-8S for larch@yhetil.org; Wed, 16 Sep 2020 02:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIQhe-0001UD-Vf for bug-guix@gnu.org; Wed, 16 Sep 2020 02:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIQhe-0005iL-5r for bug-guix@gnu.org; Wed, 16 Sep 2020 02:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kIQhe-00020o-1J for bug-guix@gnu.org; Wed, 16 Sep 2020 02:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43435: bootstrap (bash-mesboot0) and =?UTF-8?Q?=E2=80=99make_?= =?UTF-8?Q?release=E2=80=99?= error Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 16 Sep 2020 06:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43435 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: zimoun Received: via spool by 43435-submit@debbugs.gnu.org id=B43435.16002368397718 (code B ref 43435); Wed, 16 Sep 2020 06:14:01 +0000 Received: (at 43435) by debbugs.gnu.org; 16 Sep 2020 06:13:59 +0000 Received: from localhost ([127.0.0.1]:32975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIQhX-00020N-R9 for submit@debbugs.gnu.org; Wed, 16 Sep 2020 02:13:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIQhW-00020A-1V for 43435@debbugs.gnu.org; Wed, 16 Sep 2020 02:13:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34491) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIQhN-0005gg-Sa; Wed, 16 Sep 2020 02:13:45 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=53844 helo=dundal.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kIQhN-0003Ml-CM; Wed, 16 Sep 2020 02:13:45 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <86ft7izokc.fsf@gmail.com> X-Url: http://AvatarAcademy.nl Date: Wed, 16 Sep 2020 08:13:11 +0200 In-Reply-To: <86ft7izokc.fsf@gmail.com> (zimoun's message of "Wed, 16 Sep 2020 00:02:11 +0200") Message-ID: <87lfhal05k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 43435@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: YJDu9uow4u0M --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable zimoun writes: Hello zimoun! > Reading the release document [1] and going step by step, so I start from > a fresh worktree and branch and I tweak a bit (maybe I am doing wrong) > otherwise it fails: [..] > guix-1.0.1.22205-a8360-dirty/gnu/packages/commencement.scm:// /gnu/store/= cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: err= or: 'sigprocmask' defined twice > error: store file names embedded in the distribution > make[4]: *** [Makefile:6335: assert-no-store-file-names] Error 1 So, this =E2=80=99assert-no-store-file-names=E2=80=99 check in Makefile.am = greps for -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; which is really meant for source code; to catch the use of hardcoded store file names. Unfortunately, however ... [..] > On IRC [2], it rings a bell. :-) The error should come from > =E2=80=99bash-mesboot0=E2=80=99 in (gnu packages commencement) at the =E2= =80=99modify-phases=E2=80=99 > [3]: > > (add-after 'configure 'configure-fixups > (lambda _ > (substitute* "config.h" > (("#define GETCWD_BROKEN 1") "#undef GETCWD_BROKEN")) > (let ((config.h (open-file "config.h" "a"))) > (display (string-append " > // tcc: error: undefined symbol 'enable_hostname_completion' > #define enable_hostname_completion(on_or_off) 0 > > // /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a= /lib/libc.a: error: 'sigprocmask' defined twice a commented store file name was added inside a code snippet. Changing this comment to something like // /gnu/store/...-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigpro= cmask' defined twice would pass the check, but this triggers a rebuld world. So I am proposing the attached patch that breaks the comment to pass the check, and using unquoted string-append to avoid a world rebuild. Greetings, Janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-commencement-bash-mesboot0-Break-store-file-name.patch Content-Transfer-Encoding: quoted-printable >From 7256bae0eebbec22c42a482ccfdf12fd8b874188 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 16 Sep 2020 06:57:51 +0200 Subject: [PATCH] gnu: commencement: bash-mesboot0: Break store file-name in comment. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=3DUTF-8 This fixes running =E2=80=98make release=E2=80=99. * gnu/packages/commencement.scm (bash-mesboot0)[arguments]: Break store file name in commend and add unquoted string-append to silence store file name check. The store file name check is meant for code, this file name was unfortunately used is a comment. --- gnu/packages/commencement.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 565799c611..8a0864f26a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -788,14 +788,17 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" (substitute* "config.h" (("#define GETCWD_BROKEN 1") "#undef GETCWD_BROKEN")) (let ((config.h (open-file "config.h" "a"))) - (display (string-append " + (display (string-append + ;; XXX TODO: remove nested ,(string-append ...) a= nd + ;; store file name on next rebuild cycle + ,(string-append " // tcc: error: undefined symbol 'enable_hostname_completion' #define enable_hostname_completion(on_or_off) 0 =20 -// /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/= lib/libc.a: error: 'sigprocmask' defined twice +// /gnu/store/" "cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e= 9a/lib/libc.a: error: 'sigprocmask' defined twice #define HAVE_POSIX_SIGNALS 1 #define endpwent(x) 0 -") +")) config.h) (close config.h)) #t)) --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-=--