From b85863f7ce99d05205e57358b36ff50656cca08b Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 16 Sep 2020 06:57:51 +0200 Subject: gnu: commencement: bash-mesboot0: Break store file-name in comment. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Vagrant Cascadian . * gnu/packages/commencement.scm (bash-mesboot0)[arguments]: Break store file name in comment and add unquoted string-append to silence the ’assert-no-store-file-names’ check. The store file name check is really meant for code; this file name was unfortunately used is a comment. --- gnu/packages/commencement.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/commencement.scm') 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 @@ (define bash-mesboot0 (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 ...) and + ;; store file name on next rebuild cycle + ,(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 +// /gnu/store/" "cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice #define HAVE_POSIX_SIGNALS 1 #define endpwent(x) 0 -") +")) config.h) (close config.h)) #t)) -- cgit v1.2.3 From 4e896da45d7be42ff1ad0b2be741b168573e6f0e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 25 Sep 2020 23:09:48 +0200 Subject: gnu: nyacc: Add 1.03.0. * gnu/packages/mes.scm (nyacc): Rename to... (nyacc-0.99): ... this. (nyacc): New variable. (mes)[propagated-inputs]: Replace NYACC with NYACC-0.99. (mes-rb5)[native-inputs]: Likewise. * gnu/packages/commencement.scm (mes-boot)[native-inputs]: Likewise. (tcc-boot0)[native-inputs]: Likewise. --- gnu/packages/commencement.scm | 4 ++-- gnu/packages/mes.scm | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8a0864f26a..4041d5bb89 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -381,7 +381,7 @@ (define mes-boot (inputs '()) (propagated-inputs '()) (native-inputs - `(("nyacc-source" ,(origin (inherit (package-source nyacc)) + `(("nyacc-source" ,(origin (inherit (package-source nyacc-0.99)) (snippet #f))) ("mes" ,%bootstrap-mes-rewired) ("mescc-tools" ,%bootstrap-mescc-tools) @@ -477,7 +477,7 @@ (define tcc-boot0 (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("nyacc-source" ,(origin (inherit (package-source nyacc)) + ("nyacc-source" ,(origin (inherit (package-source nyacc-0.99)) (snippet #f))) ("mescc-tools" ,%bootstrap-mescc-tools) ,@(%boot-gash-inputs))) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 9ffbe33ab7..d574071cc4 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -64,7 +64,7 @@ (define-public nyacc-0.86 (home-page "https://savannah.nongnu.org/projects/nyacc") (license (list gpl3+ lgpl3+)))) -(define-public nyacc +(define-public nyacc-0.99 (package (inherit nyacc-0.86) (version "0.99.0") @@ -95,6 +95,20 @@ (define-public nyacc (inputs `(("guile" ,guile-2.2))))) +(define-public nyacc + (package + (inherit nyacc-0.99) + (version "1.03.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/nyacc/nyacc-" + version ".tar.gz")) + (sha256 + (base32 + "1vdiqpm3p0ndmpmkzcpkpjvgklfsk4wxrhkixdxbczpafdfl635p")))) + (inputs + `(("guile" ,guile-3.0))))) + (define-public mes-0.19 ;; Mes used for bootstrap. (package @@ -153,7 +167,7 @@ (define-public mes "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) (propagated-inputs `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc))) + ("nyacc" ,nyacc-0.99))) (native-search-paths (list (search-path-specification (variable "C_INCLUDE_PATH") @@ -185,7 +199,7 @@ (define-public mes-rb5 ("make" ,gnu-make) ("mes" ,mes) ("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc) + ("nyacc" ,nyacc-0.99) ("sed" ,sed) ("tar" ,tar))) (supported-systems '("i686-linux")) -- cgit v1.2.3 From f848c276f0be22e66b661fe45d60d53fc0013172 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 28 Sep 2020 21:07:09 +0200 Subject: gnu: gcc-toolchain: Add 'GUIX_LOCPATH' to the search paths. This allows 'gcc-toolchain' to be used as a drop-in replacement for the default tool chain through '--with-toolchain=gcc-toolchain'. * gnu/packages/commencement.scm (make-gcc-toolchain)[native-search-paths] [search-paths]: Append LIBC's search paths. --- gnu/packages/commencement.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4041d5bb89..0938bc3d46 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3856,8 +3856,12 @@ (define* (make-gcc-toolchain gcc "libc-static"))) #t)))) - (native-search-paths (package-native-search-paths gcc)) - (search-paths (package-search-paths gcc)) + (native-search-paths + (append (package-native-search-paths gcc) + (package-native-search-paths libc))) ;GUIX_LOCPATH + (search-paths + (append (package-search-paths gcc) + (package-search-paths libc))) (license (package-license gcc)) (synopsis "Complete GCC tool chain for C/C++ development") -- cgit v1.2.3