GNU bug report logs - #63004
Add support for disallowed-references to cmake and don't let ldc depend on tzdata

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63004 in the body.
You can then email your comments to 63004 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: Add support for disallowed-references to cmake and don't let ldc
 depend on tzdata
Date: Fri, 21 Apr 2023 16:47:18 -0400

Here are some small patches to remove a bogus tzdata dependency from
ldc-bootstrap. This should be okay for master based on my tests.

Message #8 received at 63004 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 63004 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on tzdata.
Date: Fri, 21 Apr 2023 16:49:58 -0400

* gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata.
[native-inputs]: Add tzdata-for-tests.
[arguments]: Forbid references to tzdata-for-tests.
---
 gnu/packages/dlang.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index 729d6015ae..eafc0a7bbf 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -159,7 +159,8 @@ (define ldc-bootstrap
         (base32 "1kfs4fpr1525sv2ny10hlfppy8c075vjm8m649wr2b9411pkgfzx"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f                  ;skip in the bootstrap
+     `(#:disallowed-references (,tzdata-for-tests)
+       #:tests? #f                  ;skip in the bootstrap
        #:build-type "Release"
        #:configure-flags
         (list "-GNinja")
@@ -187,7 +188,6 @@ (define ldc-bootstrap
     (inputs
      `(("libconfig" ,libconfig)
        ("libedit" ,libedit)
-       ("tzdata" ,tzdata)
        ("zlib" ,zlib)))
     (native-inputs
      `(("lld-wrapper" ,(make-lld-wrapper lld-11 #:lld-as-ld? #t))
@@ -195,6 +195,7 @@ (define ldc-bootstrap
        ("ldc" ,gdmd)
        ("ninja" ,ninja)
        ("python-wrapper" ,python-wrapper)
+       ("tzdata" ,tzdata-for-tests)
        ("unzip" ,unzip)))
     (home-page "http://wiki.dlang.org/LDC")
     (synopsis "LLVM-based compiler for the D programming language")
-- 
2.39.2

Message #11 received at 63004 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 63004 <at> debbugs.gnu.org
Subject: [PATCH 1/2] build-system/cmake: Add support for the
 #:disallowed-references key.
Date: Fri, 21 Apr 2023 16:49:57 -0400

* guix/build-system/cmake.scm (cmake-build, cmake-cross-build):
Add #:disallowed-references.
---
 guix/build-system/cmake.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 09e3ac85db..ed979b9c6b 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -116,7 +116,8 @@ (define* (cmake-build name inputs
                       (substitutable? #t)
                       (imported-modules %cmake-build-system-modules)
                       (modules '((guix build cmake-build-system)
-                                 (guix build utils))))
+                                 (guix build utils)))
+                      disallowed-references)
   "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
 provides a 'CMakeLists.txt' file as its build system."
   (define build
@@ -158,6 +159,7 @@ (define build
                       #:target #f
                       #:graft? #f
                       #:substitutable? substitutable?
+                      #:disallowed-references disallowed-references
                       #:guile-for-build guile)))
 
 
@@ -193,7 +195,8 @@ (define* (cmake-cross-build name
                             (build (nix-system->gnu-triplet system))
                             (imported-modules %cmake-build-system-modules)
                             (modules '((guix build cmake-build-system)
-                                       (guix build utils))))
+                                       (guix build utils)))
+                            disallowed-references)
   "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and
 with INPUTS.  This assumes that SOURCE provides a 'CMakeLists.txt' file as its
 build system."
-- 
2.39.2

Message #14 received at 63004 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 63004 <at> debbugs.gnu.org
Subject: Re: bug#63004: Add support for disallowed-references to cmake and
 don't let ldc depend on tzdata
Date: Sat, 06 May 2023 17:16:18 +0200

Hi Leo,

The ‘cmake-build-system’ was pushed as
3b5b6683037dfb8f02d04ad3e6c2f04062db9a16 (a useful improvement).

The ‘ldc-bootstrap’ change LGTM!

Ludo’.

Message #19 received at 63004-done <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Leo Famulari <leo <at> famulari.name>, 63004-done <at> debbugs.gnu.org
Subject: Re: [bug#63004] [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on
 tzdata.
Date: Wed, 17 May 2023 23:26:32 +0200

[Message part 1 (text/plain, inline)]

Hi Leo,

Leo Famulari <leo <at> famulari.name> writes:

> * gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata.
> [native-inputs]: Add tzdata-for-tests.
> [arguments]: Forbid references to tzdata-for-tests.

LGTM, applied as d19c7c2791dc01d678ec017ad83868d5629b53f6.

Best,
-- 
Josselin Poiret

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 63004-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Josselin Poiret <dev <at> jpoiret.xyz>
Cc: 63004-done <at> debbugs.gnu.org
Subject: Re: [bug#63004] [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on
 tzdata.
Date: Thu, 18 May 2023 12:59:49 -0400

On Wed, May 17, 2023 at 11:26:32PM +0200, Josselin Poiret wrote:
> Hi Leo,
> 
> Leo Famulari <leo <at> famulari.name> writes:
> 
> > * gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata.
> > [native-inputs]: Add tzdata-for-tests.
> > [arguments]: Forbid references to tzdata-for-tests.
> 
> LGTM, applied as d19c7c2791dc01d678ec017ad83868d5629b53f6.

Thank you!

Message #25 received at 63004 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 63004 <at> debbugs.gnu.org
Subject: Re: bug#63004: Add support for disallowed-references to cmake and
 don't let ldc depend on tzdata
Date: Fri, 26 May 2023 13:44:25 -0400

On Sat, May 06, 2023 at 05:16:18PM +0200, Ludovic Courtès wrote:
> Hi Leo,
> 
> The ‘cmake-build-system’ was pushed as
> 3b5b6683037dfb8f02d04ad3e6c2f04062db9a16 (a useful improvement).
> 
> The ‘ldc-bootstrap’ change LGTM!

Thanks for looking! Josselin helpfully pushed the ldc-bootstrap change
as d19c7c2791dc01d678ec017ad83868d5629b53f6

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.