me
/
guix
Archived
1
0
Fork 0
Code

gnu: guile: Remove input labels. 

* gnu/packages/base.scm (libiconv-if-needed): Remove input label.
* gnu/packages/guile.scm (guile-2.0)[native-inputs, inputs]
[propagated-inputs]: Remove labels.
(guile-next)[native-inputs]: Change "self" to "guile".
(make-guile-readline): Adjust 'inputs' and 'propagated-inputs'
accordingly.
master
Ludovic Courtès 2023-02-23 21:45:43 +01:00
parent 97f72203dc
commit d427ec4038
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/base.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
@ -1546,7 +1546,7 @@ package needs iconv ,@(libiconv-if-needed) should be added."
;; POSIX C libraries provide iconv. Platforms with an incomplete libc ;; POSIX C libraries provide iconv. Platforms with an incomplete libc
;; without iconv, such as MinGW, must return the then clause. ;; without iconv, such as MinGW, must return the then clause.
(if (target-mingw? target) (if (target-mingw? target)
`(("libiconv" ,libiconv)) (list libiconv)
'())) '()))
(define-public (canonical-package package) (define-public (canonical-package package)

60
gnu/packages/guile.scm
View File

@ -157,32 +157,35 @@ without requiring the source code to be rewritten.")
(build-system gnu-build-system) (build-system gnu-build-system)
;; When cross-compiling, a native version of Guile itself is needed. ;; When cross-compiling, a native version of Guile itself is needed.
(native-inputs `(,@(if (%current-target-system) (native-inputs
`(("self" ,this-package)) (append (list pkg-config)
'()) (if (%current-target-system)
("pkgconfig" ,pkg-config))) (list this-package)
(inputs `(("libffi" ,libffi) '())))
,@(libiconv-if-needed) (inputs
(append (list libffi)
(libiconv-if-needed)
;; We need Bash when cross-compiling because some of the scripts ;; We need Bash when cross-compiling because some of the scripts
;; in bin/ refer to it. Use 'bash-minimal' because we don't need ;; in bin/ refer to it. Use 'bash-minimal' because we don't need
;; an interactive Bash with Readline and all. ;; an interactive Bash with Readline and all.
,@(if (target-mingw?) '() `(("bash" ,bash-minimal))))) (if (target-mingw?) '() (list bash-minimal))))
(propagated-inputs (propagated-inputs
`( ;; These ones aren't normally needed here, but since `libguile-2.0.la' (list
;; reads `-lltdl -lunistring', adding them here will add the needed ;; These ones aren't normally needed here, but since `libguile-2.0.la'
;; `-L' flags. As for why the `.la' file lacks the `-L' flags, see ;; reads `-lltdl -lunistring', adding them here will add the needed
;; <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903>. ;; `-L' flags. As for why the `.la' file lacks the `-L' flags, see
("libunistring" ,libunistring) ;; <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903>.
libunistring
;; Depend on LIBLTDL, not LIBTOOL. That way, we avoid some the extra ;; Depend on LIBLTDL, not LIBTOOL. That way, we avoid some the extra
;; dependencies that LIBTOOL has, which is helpful during bootstrap. ;; dependencies that LIBTOOL has, which is helpful during bootstrap.
("libltdl" ,libltdl) libltdl
;; The headers and/or `guile-2.0.pc' refer to these packages, so they ;; The headers and/or `guile-2.0.pc' refer to these packages, so they
;; must be propagated. ;; must be propagated.
("bdw-gc" ,libgc) libgc
("gmp" ,gmp))) gmp))
(outputs '("out" "debug")) (outputs '("out" "debug"))
@ -247,7 +250,8 @@ without requiring the source code to be rewritten.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-2.2 (define-public guile-2.2
(package (inherit guile-2.0) (package
(inherit guile-2.0)
(name "guile") (name "guile")
(version "2.2.7") (version "2.2.7")
(source (origin (source (origin
@ -453,7 +457,7 @@ without requiring the source code to be rewritten.")
gnu-gettext gnu-gettext
texinfo texinfo
gperf) gperf)
(replace "self" this-package))) (replace "guile" this-package)))
(synopsis "Development version of GNU Guile")))) (synopsis "Development version of GNU Guile"))))
(define* (make-guile-readline guile #:optional (name "guile-readline")) (define* (make-guile-readline guile #:optional (name "guile-readline"))
@ -501,11 +505,9 @@ without requiring the source code to be rewritten.")
#t))))) #t)))))
(home-page (package-home-page guile)) (home-page (package-home-page guile))
(native-inputs (package-native-inputs guile)) (native-inputs (package-native-inputs guile))
(inputs (propagated-inputs (package-propagated-inputs guile))
`(,@(package-inputs guile) ;to placate 'configure' (inputs (modify-inputs (package-inputs guile)
,@(package-propagated-inputs guile) (prepend guile readline)))
("guile" ,guile)
("readline" ,readline)))
(synopsis "Line editing support for GNU Guile") (synopsis "Line editing support for GNU Guile")
(description (description
"This module provides line editing support via the Readline library for "This module provides line editing support via the Readline library for