From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kLKQE1jnYV9VRwAA0tVLHw (envelope-from ) for ; Wed, 16 Sep 2020 10:22:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0JhzD1jnYV9gKwAAbx9fmQ (envelope-from ) for ; Wed, 16 Sep 2020 10:22:16 +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 DD6CE940365 for ; Wed, 16 Sep 2020 10:22:15 +0000 (UTC) Received: from localhost ([::1]:52236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIUZq-0007gR-T1 for larch@yhetil.org; Wed, 16 Sep 2020 06:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIUZf-0007eD-5N for bug-guix@gnu.org; Wed, 16 Sep 2020 06:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIUZe-0004lH-BS for bug-guix@gnu.org; Wed, 16 Sep 2020 06:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kIUZe-0008Mk-7r for bug-guix@gnu.org; Wed, 16 Sep 2020 06:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43005: make dist fails: "store file names embedded in the distribution" Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 16 Sep 2020 10:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43005 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Jan Nieuwenhuizen Received: via spool by 43005-submit@debbugs.gnu.org id=B43005.160025168932108 (code B ref 43005); Wed, 16 Sep 2020 10:22:02 +0000 Received: (at 43005) by debbugs.gnu.org; 16 Sep 2020 10:21:29 +0000 Received: from localhost ([127.0.0.1]:33303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIUZ6-0008Ln-Up for submit@debbugs.gnu.org; Wed, 16 Sep 2020 06:21:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIUZ5-0008Lb-EY for 43005@debbugs.gnu.org; Wed, 16 Sep 2020 06:21:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37118) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIUZ0-0004hx-6b; Wed, 16 Sep 2020 06:21:22 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39272 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kIUYz-0007dO-Df; Wed, 16 Sep 2020 06:21:21 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87wo1p3uja.fsf@yucca> <871rjwsh1y.fsf@gnu.org> Date: Wed, 16 Sep 2020 12:21:09 +0200 In-Reply-To: <871rjwsh1y.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Mon, 24 Aug 2020 08:18:17 +0200") Message-ID: <87o8m6nht6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vagrant Cascadian , 43005@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: C+OqL/R6CLW5 Hello! Jan Nieuwenhuizen skribis: >> When I tried to run make dist, it fails: >> >> guix-1.0.1.21330-a8c8f-dirty/gnu/packages/commencement.scm: >> // /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004= e9a/lib/libc.a: error: 'sigprocmask' defined t >> error: store file names embedded in the distribution >> >> The attached patch triggers pretty extensive rebuilds, but should fix >> the problem. > > Oops; your patch is fine (see nit-pick) for core-updates; but as you > noticed, on master we need to add an indirection to avoid rebuilds. > What about something like > > diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm > index aa30e3fa18..48f9a47c6b 100644 > --- a/gnu/packages/commencement.scm > +++ b/gnu/packages/commencement.scm > @@ -788,14 +788,16 @@ $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 " > + ;; TODO: remove ,(string-append hack in next rebuild cycle > + ;; together with store file name > + (display (string-append ,(string-append " > // tcc: error: undefined symbol 'enable_hostname_completion' > #define enable_hostname_completion(on_or_off) 0 >=20=20 > -// /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9= a/lib/libc.a: error: 'sigprocmask' defined twice > +// /gnu/store/" "cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c00= 4e9a/lib/libc.a: error: 'sigprocmask' defined twice > #define HAVE_POSIX_SIGNALS 1 > #define endpwent(x) 0 > -") > +")) Well done! Could you push to =E2=80=98master=E2=80=99 (with a =E2=80=9CFix= es=E2=80=9D line in the commit log)? >> From 6e77f342c0deca73fa608365bbceb14aaf675b21 Mon Sep 17 00:00:00 2001 >> From: Vagrant Cascadian >> Date: Sun, 23 Aug 2020 14:10:57 -0700 >> Subject: [PATCH] gnu: commencement: bash-mesboot0: Remove store file nam= e. > > [..] > >> diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.s= cm >> index aa30e3fa18..617a12016f 100644 >> --- a/gnu/packages/commencement.scm >> +++ b/gnu/packages/commencement.scm >> @@ -792,7 +792,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\" >> // tcc: error: undefined symbol 'enable_hostname_completion' >> #define enable_hostname_completion(on_or_off) 0 >>=20=20 >> -// /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e= 9a/lib/libc.a: error: 'sigprocmask' defined twice >> +// /gnu/store/=E2=80=A6-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: '= sigprocmask' defined twice >> #define HAVE_POSIX_SIGNALS 1 >> #define endpwent(x) 0 >> ") > ^ > > This is the closing parenthesis of a string-append that has only this > one big string; what about removing that string-append altogether? Agreed. Vagrant, could you push it to core-updates with this change? Thanks, Ludo=E2=80=99.