From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mEV3Gd5bQ18RcgAA0tVLHw (envelope-from ) for ; Mon, 24 Aug 2020 06:19:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6OBsFd5bQ1/LRgAAB5/wlQ (envelope-from ) for ; Mon, 24 Aug 2020 06:19:10 +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 CD258940367 for ; Mon, 24 Aug 2020 06:19:09 +0000 (UTC) Received: from localhost ([::1]:58650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kA5oy-0000ca-Bf for larch@yhetil.org; Mon, 24 Aug 2020 02:19:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kA5os-0000cR-60 for bug-guix@gnu.org; Mon, 24 Aug 2020 02:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kA5or-0005vp-TZ for bug-guix@gnu.org; Mon, 24 Aug 2020 02:19:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kA5or-0006lQ-PY for bug-guix@gnu.org; Mon, 24 Aug 2020 02:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43005: make dist fails: "store file names embedded in the distribution" Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 24 Aug 2020 06:19:01 +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: Vagrant Cascadian Received: via spool by 43005-submit@debbugs.gnu.org id=B43005.159824992225972 (code B ref 43005); Mon, 24 Aug 2020 06:19:01 +0000 Received: (at 43005) by debbugs.gnu.org; 24 Aug 2020 06:18:42 +0000 Received: from localhost ([127.0.0.1]:55837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kA5oJ-0006kY-Lm for submit@debbugs.gnu.org; Mon, 24 Aug 2020 02:18:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kA5oI-0006kI-7W for 43005@debbugs.gnu.org; Mon, 24 Aug 2020 02:18:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39066) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kA5oC-0005sB-PK; Mon, 24 Aug 2020 02:18:20 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=36918 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kA5oC-0004UZ-94; Mon, 24 Aug 2020 02:18:20 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <87wo1p3uja.fsf@yucca> X-Url: http://AvatarAcademy.nl Date: Mon, 24 Aug 2020 08:18:17 +0200 In-Reply-To: <87wo1p3uja.fsf@yucca> (Vagrant Cascadian's message of "Sun, 23 Aug 2020 14:46:17 -0700") Message-ID: <871rjwsh1y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (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: -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: 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: I7v10Kg4v8Nw Vagrant Cascadian writes: Hello! > 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.c004e= 9a/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 --8<---------------cut here---------------start------------->8--- 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 -// /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)) --8<---------------cut here---------------end--------------->8--- Thanks for catching this! Greetings, Janneke > 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 name. [..] > diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm > 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.c004e9= a/lib/libc.a: error: 'sigprocmask' defined twice > +// /gnu/store/=E2=80=A6-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 's= igprocmask' 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? --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com