mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2024-11-22 16:38:09 +01:00
nongnu: ncurses-5: Update to use gexp and C++11.
* nongnu/packages/ncurses.scm (ncurses-rollup-patch): New variable. (ncurses-5): Backport changes from upstream guix repo. Note that ncurses-5 fails to build with the new C++17 default, so we also need to explicitly force C++11. (ncurses/tinfo-5): Use gexp and remove outdated comment. Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
B. Wilson
Jonathan Brielmaier
parent
c7be2b5e3b
commit
de107ac8cf
1 changed files with 146 additions and 151 deletions
|
|
@ -8,11 +8,13 @@
|
||||||
;;; Copyright © 2017, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
|
;;; Copyright © 2017, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
|
||||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||||
;;; Copyright © 2022 B. Wilson <x@wilsonb.com>
|
;;; Copyright © 2022-2023 B. Wilson <x@wilsonb.com>
|
||||||
|
|
||||||
(define-module (nongnu packages ncurses)
|
(define-module (nongnu packages ncurses)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix licenses)
|
#:use-module (guix licenses)
|
||||||
|
#:use-module (guix memoization)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
|
@ -25,6 +27,17 @@
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (ice-9 match))
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
|
(define ncurses-rollup-patch
|
||||||
|
(mlambda (version hash)
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (match (string-split (version-major+minor+point version) #\.)
|
||||||
|
((major minor point)
|
||||||
|
(string-append "https://invisible-mirror.net/archives"
|
||||||
|
"/ncurses/" major "." minor "/ncurses-"
|
||||||
|
major "." minor "-" point "-patch.sh.bz2"))))
|
||||||
|
(sha256 (base32 hash)))))
|
||||||
|
|
||||||
(define-public ncurses-5
|
(define-public ncurses-5
|
||||||
(package
|
(package
|
||||||
(name "ncurses")
|
(name "ncurses")
|
||||||
|
|
@ -42,172 +55,157 @@
|
||||||
"doc")) ;1 MiB of man pages
|
"doc")) ;1 MiB of man pages
|
||||||
(arguments
|
(arguments
|
||||||
(let ((patch-makefile-phase
|
(let ((patch-makefile-phase
|
||||||
'(lambda _
|
#~(lambda _
|
||||||
(for-each patch-makefile-SHELL
|
(for-each patch-makefile-SHELL
|
||||||
(find-files "." "Makefile.in"))))
|
(find-files "." "Makefile.in"))))
|
||||||
(configure-phase
|
(configure-phase
|
||||||
;; The 'configure' script does not understand '--docdir', so we must
|
;; The 'configure' script does not understand '--docdir', so we must
|
||||||
;; override that and use '--mandir' instead.
|
;; override that and use '--mandir' instead.
|
||||||
'(lambda* (#:key build target outputs configure-flags
|
#~(lambda* (#:key build target outputs configure-flags
|
||||||
#:allow-other-keys)
|
#:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(let ((out (assoc-ref outputs "out"))
|
||||||
(doc (assoc-ref outputs "doc")))
|
(doc (assoc-ref outputs "doc")))
|
||||||
(apply invoke "./configure"
|
(apply invoke "./configure"
|
||||||
(string-append "SHELL=" (which "sh"))
|
(string-append "SHELL=" (which "sh"))
|
||||||
(string-append "--build=" build)
|
(string-append "--build=" build)
|
||||||
(string-append "--prefix=" out)
|
(string-append "--prefix=" out)
|
||||||
(string-append "--mandir=" doc "/share/man")
|
(string-append "--mandir=" doc "/share/man")
|
||||||
(if target
|
(if target
|
||||||
(cons (string-append "--host=" target)
|
(cons (string-append "--host=" target)
|
||||||
configure-flags)
|
configure-flags)
|
||||||
configure-flags)))))
|
configure-flags)))))
|
||||||
(apply-rollup-patch-phase
|
(apply-rollup-patch-phase
|
||||||
;; Ncurses distributes "stable" patchsets to be applied on top
|
;; Ncurses distributes "stable" patchsets to be applied on top
|
||||||
;; of the release tarball. These are only available as shell
|
;; of the release tarball. These are only available as shell
|
||||||
;; scripts(!) so we decompress and apply them in a phase.
|
;; scripts(!) so we decompress and apply them in a phase.
|
||||||
;; See <https://invisible-mirror.net/archives/ncurses/6.1/README>.
|
;; See <https://invisible-mirror.net/archives/ncurses/6.1/README>.
|
||||||
'(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
#~(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||||
(let ((rollup-patch (assoc-ref (or native-inputs inputs)
|
(let ((rollup-patch #$(ncurses-rollup-patch
|
||||||
"rollup-patch")))
|
(package-version this-package)
|
||||||
(when rollup-patch
|
"16ny892yhimy6r4mmsgw3rcl0i15570ifn9c54g1ndyrk7kpmlgs")))
|
||||||
(copy-file rollup-patch
|
(copy-file rollup-patch
|
||||||
(string-append (getcwd) "/rollup-patch.sh.bz2"))
|
(string-append (getcwd) "/rollup-patch.sh.bz2"))
|
||||||
(invoke "bzip2" "-d" "rollup-patch.sh.bz2")
|
(invoke "bzip2" "-d" "rollup-patch.sh.bz2")
|
||||||
(invoke "sh" "rollup-patch.sh")))))
|
(invoke "sh" "rollup-patch.sh"))))
|
||||||
(remove-shebang-phase
|
(remove-shebang-phase
|
||||||
'(lambda _
|
#~(lambda _
|
||||||
;; To avoid retaining a reference to the bootstrap Bash via the
|
;; To avoid retaining a reference to the bootstrap Bash via the
|
||||||
;; shebang of the 'ncursesw6-config' script, simply remove that
|
;; shebang of the 'ncursesw6-config' script, simply remove that
|
||||||
;; shebang: it'll work just as well without it. Likewise, do not
|
;; shebang: it'll work just as well without it. Likewise, do not
|
||||||
;; retain a reference to the "doc" output.
|
;; retain a reference to the "doc" output.
|
||||||
(substitute* "misc/ncurses-config.in"
|
(substitute* "misc/ncurses-config.in"
|
||||||
(("#!@SHELL@")
|
(("#!@SHELL@")
|
||||||
"# No shebang here, use /bin/sh!\n")
|
"# No shebang here, use /bin/sh!\n")
|
||||||
(("@SHELL@ \\$0")
|
(("@SHELL@ \\$0")
|
||||||
"$0")
|
"$0")
|
||||||
(("mandir=.*$")
|
(("mandir=.*$")
|
||||||
"mandir=share/man"))))
|
"mandir=share/man"))))
|
||||||
(post-install-phase
|
(post-install-phase
|
||||||
`(lambda* (#:key outputs #:allow-other-keys)
|
#~(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out")))
|
(let ((out (assoc-ref outputs "out")))
|
||||||
;; When building a wide-character (Unicode) build, create backward
|
;; When building a wide-character (Unicode) build, create backward
|
||||||
;; compatibility links from the the "normal" libraries to the
|
;; compatibility links from the the "normal" libraries to the
|
||||||
;; wide-character ones (e.g. libncurses.so to libncursesw.so).
|
;; wide-character ones (e.g. libncurses.so to libncursesw.so).
|
||||||
,@(if (target-mingw?)
|
#$@(if (target-mingw?)
|
||||||
'( ;; TODO: create .la files to link to the .dll?
|
`( ;; TODO: create .la files to link to the .dll?
|
||||||
(with-directory-excursion (string-append out "/bin")
|
(with-directory-excursion (string-append out "/bin")
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (lib)
|
(lambda (lib)
|
||||||
(define lib.dll
|
(define lib.dll
|
||||||
(string-append "lib" lib ".dll"))
|
(string-append "lib" lib ".dll"))
|
||||||
(define libw6.dll
|
(define libwx.dll
|
||||||
(string-append "lib" lib "w6.dll"))
|
(string-append "lib" lib "w"
|
||||||
|
,(version-major version) ".dll"))
|
||||||
|
|
||||||
(when (file-exists? libw6.dll)
|
(when (file-exists? libwx.dll)
|
||||||
(format #t "creating symlinks for `lib~a'~%" lib)
|
(format #t "creating symlinks for `lib~a'~%" lib)
|
||||||
(symlink libw6.dll lib.dll)))
|
(symlink libw6.dll lib.dll)))
|
||||||
'("curses" "ncurses" "form" "panel" "menu"))))
|
'("curses" "ncurses" "form" "panel" "menu"))))
|
||||||
'())
|
#~())
|
||||||
(with-directory-excursion (string-append out "/lib")
|
(with-directory-excursion (string-append out "/lib")
|
||||||
(for-each (lambda (lib)
|
(for-each (lambda (lib)
|
||||||
(define libw.a
|
(define libw.a
|
||||||
(string-append "lib" lib "w.a"))
|
(string-append "lib" lib "w.a"))
|
||||||
(define lib.a
|
(define lib.a
|
||||||
(string-append "lib" lib ".a"))
|
(string-append "lib" lib ".a"))
|
||||||
|
|
||||||
,@(if (not (target-mingw?))
|
#$@(if (not (target-mingw?))
|
||||||
`((define libw.so.x
|
#~((define libw.so.x
|
||||||
(string-append "lib" lib "w.so."
|
(string-append "lib" lib "w.so."
|
||||||
,(version-major version)))
|
#$(version-major version)))
|
||||||
(define lib.so.x
|
(define lib.so.x
|
||||||
(string-append "lib" lib ".so."
|
(string-append "lib" lib ".so."
|
||||||
,(version-major version)))
|
#$(version-major version)))
|
||||||
(define lib.so
|
(define lib.so
|
||||||
(string-append "lib" lib ".so"))
|
(string-append "lib" lib ".so"))
|
||||||
(define packagew.pc
|
(define packagew.pc
|
||||||
(string-append lib "w.pc"))
|
(string-append lib "w.pc"))
|
||||||
(define package.pc
|
(define package.pc
|
||||||
(string-append lib ".pc")))
|
(string-append lib ".pc")))
|
||||||
'())
|
#~())
|
||||||
|
|
||||||
(when (file-exists? libw.a)
|
(when (file-exists? libw.a)
|
||||||
(format #t "creating symlinks for `lib~a'~%" lib)
|
(format #t "creating symlinks for `lib~a'~%" lib)
|
||||||
(symlink libw.a lib.a)
|
(symlink libw.a lib.a)
|
||||||
,@(if (not (target-mingw?))
|
#$@(if (not (target-mingw?))
|
||||||
'((symlink libw.so.x lib.so.x)
|
'((symlink libw.so.x lib.so.x)
|
||||||
(false-if-exception (delete-file lib.so))
|
(false-if-exception (delete-file lib.so))
|
||||||
(call-with-output-file lib.so
|
(call-with-output-file lib.so
|
||||||
(lambda (p)
|
(lambda (p)
|
||||||
(format p "INPUT (-l~aw)~%" lib)))
|
(format p "INPUT (-l~aw)~%" lib)))
|
||||||
(with-directory-excursion "pkgconfig"
|
(with-directory-excursion "pkgconfig"
|
||||||
(format #t "creating symlink for `~a'~%"
|
(format #t "creating symlink for `~a'~%"
|
||||||
package.pc)
|
package.pc)
|
||||||
(when (file-exists? packagew.pc)
|
(when (file-exists? packagew.pc)
|
||||||
(symlink packagew.pc package.pc))))
|
(symlink packagew.pc package.pc))))
|
||||||
'())))
|
#~())))
|
||||||
'("curses" "ncurses" "form" "panel" "menu")))))))
|
'("curses" "ncurses" "form" "panel" "menu")))))))
|
||||||
`(#:configure-flags
|
(list #:configure-flags
|
||||||
,(cons*
|
#~`("--with-shared" "--without-debug" "--enable-widec"
|
||||||
'quasiquote
|
|
||||||
`(("--with-shared" "--without-debug" "--enable-widec"
|
|
||||||
|
|
||||||
"--enable-pc-files" "--with-versioned-syms=yes"
|
"--enable-pc-files" "--with-versioned-syms=yes"
|
||||||
,(list 'unquote '(string-append "--with-pkg-config-libdir="
|
,(string-append "--with-pkg-config-libdir="
|
||||||
(assoc-ref %outputs "out")
|
#$output "/lib/pkgconfig")
|
||||||
"/lib/pkgconfig"))
|
|
||||||
|
|
||||||
;; By default headers land in an `ncursesw' subdir, which is not
|
;; By default headers land in an `ncursesw' subdir, which is not
|
||||||
;; what users expect.
|
;; what users expect.
|
||||||
,(list 'unquote '(string-append "--includedir=" (assoc-ref %outputs "out")
|
,(string-append "--includedir=" #$output "/include")
|
||||||
"/include"))
|
"--enable-overwrite" ;really honor --includedir
|
||||||
"--enable-overwrite" ;really honor --includedir
|
|
||||||
|
|
||||||
;; Make sure programs like 'tic', 'reset', and 'clear' have a
|
;; Make sure programs like 'tic', 'reset', and 'clear' have a
|
||||||
;; correct RUNPATH.
|
;; correct RUNPATH.
|
||||||
,(list 'unquote '(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out")
|
,(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
|
||||||
"/lib"))
|
|
||||||
|
|
||||||
;; Starting from ncurses 6.1, "make install" runs "install -s"
|
;; Starting from ncurses 6.1, "make install" runs "install -s"
|
||||||
;; by default, which doesn't work for cross-compiled binaries
|
;; by default, which doesn't work for cross-compiled binaries
|
||||||
;; because it invokes 'strip' instead of 'TRIPLET-strip'. Work
|
;; because it invokes 'strip' instead of 'TRIPLET-strip'. Work
|
||||||
;; around this.
|
;; around this.
|
||||||
,@(if (%current-target-system) '("--disable-stripping") '())
|
#$@(if (%current-target-system) #~("--disable-stripping") #~())
|
||||||
|
|
||||||
;; Do not assume a default search path in ld, even if it is only to
|
;; Do not assume a default search path in ld, even if it is only to
|
||||||
;; filter it out in ncurses-config. Mainly because otherwise it ends
|
;; filter it out in ncurses-config. Mainly because otherwise it ends
|
||||||
;; up using the libdir from binutils, which makes little sense and
|
;; up using the libdir from binutils, which makes little sense and
|
||||||
;; causes an unnecessary runtime dependency.
|
;; causes an unnecessary runtime dependency.
|
||||||
"cf_cv_ld_searchpath=/no-ld-searchpath"
|
"cf_cv_ld_searchpath=/no-ld-searchpath"
|
||||||
|
|
||||||
;; MinGW: Use term-driver created for the MinGW port.
|
;; MinGW: Use term-driver created for the MinGW port.
|
||||||
,@(if (target-mingw?) '("--enable-term-driver") '()))))
|
#$@(if (target-mingw?) #~("--enable-term-driver") #~())
|
||||||
#:tests? #f ; no "check" target
|
"CXXFLAGS=-std=c++11")
|
||||||
#:phases (modify-phases %standard-phases
|
#:tests? #f ; no "check" target
|
||||||
(add-after 'unpack 'apply-rollup-patch
|
#:phases #~(modify-phases %standard-phases
|
||||||
,apply-rollup-patch-phase)
|
(add-after 'unpack 'apply-rollup-patch
|
||||||
(replace 'configure ,configure-phase)
|
#$apply-rollup-patch-phase)
|
||||||
(add-after 'install 'post-install
|
(replace 'configure #$configure-phase)
|
||||||
,post-install-phase)
|
(add-after 'install 'post-install
|
||||||
(add-before 'configure 'patch-makefile-SHELL
|
#$post-install-phase)
|
||||||
,patch-makefile-phase)
|
(add-before 'configure 'patch-makefile-SHELL
|
||||||
(add-before 'patch-source-shebangs 'remove-unneeded-shebang
|
#$patch-makefile-phase)
|
||||||
,remove-shebang-phase)))))
|
(add-before 'patch-source-shebangs 'remove-unneeded-shebang
|
||||||
|
#$remove-shebang-phase)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(,@(if (%current-target-system)
|
(if (%current-target-system)
|
||||||
`(("self" ,this-package)) ;for `tic'
|
(list pkg-config this-package) ;for 'tic'
|
||||||
'())
|
(list pkg-config)))
|
||||||
("rollup-patch"
|
|
||||||
,(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (match (string-split (version-major+minor+point version) #\.)
|
|
||||||
((major minor point)
|
|
||||||
(string-append "https://invisible-mirror.net/archives"
|
|
||||||
"/ncurses/" major "." minor "/ncurses-"
|
|
||||||
major "." minor "-" point "-patch.sh.bz2"))))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"16ny892yhimy6r4mmsgw3rcl0i15570ifn9c54g1ndyrk7kpmlgs"))))
|
|
||||||
("pkg-config" ,pkg-config)))
|
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
(variable "TERMINFO_DIRS")
|
(variable "TERMINFO_DIRS")
|
||||||
|
|
@ -222,13 +220,10 @@ ncursesw library provides wide character support.")
|
||||||
(license x11)
|
(license x11)
|
||||||
(home-page "https://www.gnu.org/software/ncurses/")))
|
(home-page "https://www.gnu.org/software/ncurses/")))
|
||||||
|
|
||||||
;; Needed by u-boot 2022.04+
|
|
||||||
;; Consider merging into ncurses for next core-updates cycle.
|
|
||||||
(define-public ncurses/tinfo-5
|
(define-public ncurses/tinfo-5
|
||||||
(package/inherit ncurses-5
|
(package/inherit ncurses-5
|
||||||
(name "ncurses-with-tinfo")
|
(name "ncurses-with-tinfo")
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments ncurses-5)
|
(substitute-keyword-arguments (package-arguments ncurses-5)
|
||||||
((#:configure-flags cf)
|
((#:configure-flags cf)
|
||||||
`(cons "--with-termlib=tinfo"
|
#~(cons "--with-termlib=tinfo" #$cf))))))
|
||||||
,cf))))))
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue