gnu: readline: Remove obsolete post-install phase.

The 'strip' phase does this unconditionally now.

* gnu/packages/readline.scm (readline)[arguments]<#:phases>: Remove.
This commit is contained in:
Marius Bakke 2017-12-03 17:47:18 +01:00
parent de3a1ac648
commit a850cbdd43
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 41 additions and 56 deletions

View File

@ -50,68 +50,53 @@
(3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy"))) (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")))
(define-public readline (define-public readline
(let ((post-install-phase (package
'(lambda* (#:key outputs #:allow-other-keys) (name "readline")
(let* ((out (assoc-ref outputs "out")) (version (string-append "7.0."
(lib (string-append out "/lib"))) (number->string (length %patch-series-7.0))))
;; Make libraries writable so that `strip' can work. (source (origin
;; Failing to do that, it bails out with "Permission (method url-fetch)
;; denied". (uri (string-append "mirror://gnu/readline/readline-"
(for-each (lambda (f) (chmod f #o755)) (version-major+minor version) ".tar.gz"))
(find-files lib "\\.so")) (sha256
(for-each (lambda (f) (chmod f #o644)) (base32
(find-files lib "\\.a")))))) "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"))
(package (patches (append
(name "readline") %patch-series-7.0
(version (string-append "7.0." (search-patches "readline-link-ncurses.patch")))
(number->string (length %patch-series-7.0)))) (patch-flags '("-p0"))))
(source (origin (build-system gnu-build-system)
(method url-fetch) (propagated-inputs `(("ncurses" ,ncurses)))
(uri (string-append "mirror://gnu/readline/readline-" (arguments `(#:configure-flags
(version-major+minor version) ".tar.gz")) (list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
(sha256 (assoc-ref %build-inputs "ncurses")
(base32 "/lib")
"0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"))
(patches (append
%patch-series-7.0
(search-patches "readline-link-ncurses.patch")))
(patch-flags '("-p0"))))
(build-system gnu-build-system)
(propagated-inputs `(("ncurses" ,ncurses)))
(arguments `(#:configure-flags
(list (string-append "LDFLAGS=-Wl,-rpath -Wl,"
(assoc-ref %build-inputs "ncurses")
"/lib")
;; This test does an 'AC_TRY_RUN', which aborts when ;; This test does an 'AC_TRY_RUN', which aborts when
;; cross-compiling, so provide the correct answer. ;; cross-compiling, so provide the correct answer.
,@(if (%current-target-system) ,@(if (%current-target-system)
'("bash_cv_wcwidth_broken=no") '("bash_cv_wcwidth_broken=no")
'()) '())
;; MinGW: ncurses provides the termcap api. ;; MinGW: ncurses provides the termcap api.
,@(if (target-mingw?) ,@(if (target-mingw?)
'("bash_cv_termcap_lib=ncurses") '("bash_cv_termcap_lib=ncurses")
'())) '()))
,@(if (target-mingw?) ,@(if (target-mingw?)
;; MinGW: termcap in ncurses ;; MinGW: termcap in ncurses
;; some SIG_* #defined in _POSIX ;; some SIG_* #defined in _POSIX
'(#:make-flags '("TERMCAP_LIB=-lncurses" '(#:make-flags '("TERMCAP_LIB=-lncurses"
"CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'")) "CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'"))
'()) '())))
#:phases (alist-cons-after (synopsis "Edit command lines while typing, with history support")
'install 'post-install (description
,post-install-phase "The GNU readline library allows users to edit command lines as they
%standard-phases)))
(synopsis "Edit command lines while typing, with history support")
(description
"The GNU readline library allows users to edit command lines as they
are typed in. It can maintain a searchable history of previously entered are typed in. It can maintain a searchable history of previously entered
commands, letting you easily recall, edit and re-enter past commands. It commands, letting you easily recall, edit and re-enter past commands. It
features both Emacs-like and vi-like keybindings, making its usage features both Emacs-like and vi-like keybindings, making its usage
comfortable for anyone.") comfortable for anyone.")
(license gpl3+) (license gpl3+)
(home-page "https://savannah.gnu.org/projects/readline/")))) (home-page "https://savannah.gnu.org/projects/readline/")))
(define-public readline-6.2 (define-public readline-6.2
(package (inherit readline) (package (inherit readline)