From 3853941d25fcef931225bf6adcbf663a76220ba4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2020 18:53:26 +0200 Subject: gnu: netpbm: Omit static libraries. * gnu/packages/netpbm.scm (netpbm)[arguments]: Don't copy the static libraries to the output. --- gnu/packages/netpbm.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/netpbm.scm') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 7fe0503d6f..3e999677ba 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -170,10 +170,7 @@ (let ((out (assoc-ref outputs "out"))) (apply system* "make" "package" (string-append "pkgdir=" out) make-flags) - ;; copy static library - (copy-file (string-append out "/link/libnetpbm.a") - (string-append out "/lib/libnetpbm.a")) - ;; remove superfluous folders and files + ;; Remove superfluous files. (system* "rm" "-r" (string-append out "/link")) (system* "rm" "-r" (string-append out "/misc")) (with-directory-excursion out -- cgit v1.2.3 From 079ffbcfaf26826adcee9bb3084794c033416d37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2020 18:56:19 +0200 Subject: gnu: netpbm: Use INVOKE. * gnu/packages/netpbm.scm (netpbm)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/netpbm.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/netpbm.scm') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 3e999677ba..af005c6aec 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015, 2016 Ludovic Courtès -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,7 +145,7 @@ (add-before 'check 'setup-check (lambda _ ;; install temporarily into /tmp/netpbm - (system* "make" "package") + (invoke "make" "package") ;; remove test requiring X (substitute* "test/all-in-place.test" (("pamx") "")) ;; do not worry about non-existing file @@ -168,11 +168,11 @@ (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (apply system* "make" "package" + (apply invoke "make" "package" (string-append "pkgdir=" out) make-flags) ;; Remove superfluous files. - (system* "rm" "-r" (string-append out "/link")) - (system* "rm" "-r" (string-append out "/misc")) + (invoke "rm" "-r" (string-append out "/link")) + (invoke "rm" "-r" (string-append out "/misc")) (with-directory-excursion out (for-each delete-file '("config_template" "pkginfo" "README" -- cgit v1.2.3 From 475d5d8d159298b3f275ceda24d3754be1eeb9b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2020 19:04:32 +0200 Subject: gnu: netpbm: Delete files natively. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/netpbm.scm (netpbm)[arguments]: Delete files with DELETE-FILE-RECURSIVELY instead of invoking ‘rm’. --- gnu/packages/netpbm.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/netpbm.scm') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index af005c6aec..c88b5a9dff 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -171,12 +171,10 @@ (apply invoke "make" "package" (string-append "pkgdir=" out) make-flags) ;; Remove superfluous files. - (invoke "rm" "-r" (string-append out "/link")) - (invoke "rm" "-r" (string-append out "/misc")) (with-directory-excursion out - (for-each delete-file - '("config_template" "pkginfo" "README" - "VERSION"))) + (for-each delete-file-recursively + '("config_template" "pkginfo" "README" "VERSION" + "link/" "misc/"))) #t)))))) (synopsis "Toolkit for manipulation of images") (description -- cgit v1.2.3 From 204d55c9800b146ef8e8b249cb5be0ab8a028998 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2020 19:44:05 +0200 Subject: gnu: netpbm: Install an unversioned library link. * gnu/packages/netpbm.scm (netpbm)[arguments]: Symlink libnetpbm.so.*.* to libnetpbm.so. Reported by R Veera Kumar . --- gnu/packages/netpbm.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages/netpbm.scm') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index c88b5a9dff..126f29f06f 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -114,7 +114,10 @@ ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) @@ -174,8 +177,15 @@ (with-directory-excursion out (for-each delete-file-recursively '("config_template" "pkginfo" "README" "VERSION" - "link/" "misc/"))) - #t)))))) + "link/" "misc/")) + ;; Install the required ‘libnetpbm.so’ link. + ;; See . + (with-directory-excursion "lib" + (symlink + (match (find-files "." "^libnetpbm\\.so\\.[^.]*\\.[^.]*$") + ((head _ ...) head)) + "libnetpbm.so")) + #t))))))) (synopsis "Toolkit for manipulation of images") (description "Netpbm is a toolkit for the manipulation of graphic images, including -- cgit v1.2.3