From: Arun Isaac <arunisaac@systemreboot.net>
To: 55125@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>
Subject: [bug#55125] [PATCH 1/9] gnu: tabixpp: Use G-expressions.
Date: Tue, 26 Apr 2022 18:16:31 +0530 [thread overview]
Message-ID: <20220426124639.17159-1-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20220426124426.16845-1-arunisaac@systemreboot.net>
* gnu/packages/bioinformatics.scm (tabixpp)[source]: Reindent.
[arguments]: Use search-input-file and search-input-directory.
[source, arguments]: Rewrite using G-expressions. Do not return #t from
snippets and custom phases.
---
gnu/packages/bioinformatics.scm | 80 ++++++++++++++++-----------------
1 file changed, 39 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 40ccba247c..774da809d8 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -14264,49 +14264,48 @@ (define-public tabixpp
(name "tabixpp")
(version "1.1.0")
(source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ekg/tabixpp")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1k2a3vbq96ic4lw72iwp5s3mwwc4xhdffjj584yn6l9637q9j1yd"))
- (modules '((guix build utils)))
- (snippet
- `(begin
- (delete-file-recursively "htslib") #t))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ekg/tabixpp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1k2a3vbq96ic4lw72iwp5s3mwwc4xhdffjj584yn6l9637q9j1yd"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ (delete-file-recursively "htslib")))))
(build-system gnu-build-system)
(inputs
(list htslib zlib))
(arguments
- `(#:tests? #f ; There are no tests to run.
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; There is no configure phase.
- ;; The build phase needs overriding the location of htslib.
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((htslib-ref (assoc-ref inputs "htslib")))
- (invoke "make"
- (string-append "HTS_LIB=" htslib-ref "/lib/libhts.a")
- (string-append "INCLUDES= -I" htslib-ref "/include/htslib")
- "HTS_HEADERS=" ; No need to check for headers here.
- (string-append "LIBPATH=-L. -L" htslib-ref "/include"))
- (invoke "g++" "-shared" "-o" "libtabixpp.so" "tabix.o" "-lhts")
- (invoke "ar" "rcs" "libtabixpp.a" "tabix.o"))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (lib (string-append out "/lib"))
- (bin (string-append out "/bin")))
- (install-file "tabix++" bin)
- (install-file "libtabixpp.so" lib)
- (install-file "libtabixpp.a" lib)
- (install-file "tabix.hpp" (string-append out "/include"))
- (mkdir-p (string-append lib "/pkgconfig"))
- (with-output-to-file (string-append lib "/pkgconfig/tabixpp.pc")
- (lambda _
- (format #t "prefix=~a~@
+ (list #:tests? #f ; There are no tests to run.
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; There is no configure phase.
+ ;; The build phase needs overriding the location of htslib.
+ (replace 'build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (invoke "make"
+ (string-append "HTS_LIB=" (search-input-file inputs "/lib/libhts.a"))
+ (string-append "INCLUDES= -I" (search-input-directory inputs "/include/htslib"))
+ "HTS_HEADERS=" ; No need to check for headers here.
+ (string-append "LIBPATH=-L. -L" (search-input-directory inputs "/include")))
+ (invoke "g++" "-shared" "-o" "libtabixpp.so" "tabix.o" "-lhts")
+ (invoke "ar" "rcs" "libtabixpp.a" "tabix.o")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib"))
+ (bin (string-append out "/bin")))
+ (install-file "tabix++" bin)
+ (install-file "libtabixpp.so" lib)
+ (install-file "libtabixpp.a" lib)
+ (install-file "tabix.hpp" (string-append out "/include"))
+ (mkdir-p (string-append lib "/pkgconfig"))
+ (with-output-to-file (string-append lib "/pkgconfig/tabixpp.pc")
+ (lambda _
+ (format #t "prefix=~a~@
exec_prefix=${prefix}~@
libdir=${exec_prefix}/lib~@
includedir=${prefix}/include~@
@@ -14317,8 +14316,7 @@ (define-public tabixpp
Description: C++ wrapper around tabix project~@
Libs: -L${libdir} -ltabixpp~@
Cflags: -I${includedir}~%"
- out ,version)))
- #t))))))
+ out #$version)))))))))
(home-page "https://github.com/ekg/tabixpp")
(synopsis "C++ wrapper around tabix project")
(description "This is a C++ wrapper around the Tabix project which abstracts
--
2.35.1
next prev parent reply other threads:[~2022-04-26 12:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 12:44 [bug#55125] [PATCH 0/9] Cross-compile vcflib for RISC-V Arun Isaac
2022-04-26 12:46 ` Arun Isaac [this message]
2022-04-26 12:46 ` [bug#55125] [PATCH 2/9] gnu: tabixpp: Use #:make-flags Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 3/9] gnu: tabixpp: Use build tools specific to the target Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 4/9] gnu: tabixpp: Add bzip2 and xz to inputs Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 5/9] gnu: fastahack: Use G-expressions Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 6/9] gnu: fastahack: Use compiler specific to the build target Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 7/9] gnu: vcflib: Use G-expressions Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 8/9] gnu: vcflib: Find submodule sources in native-inputs during cross-compilation Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 9/9] gnu: vcflib: Set absolute path to pkg-config Arun Isaac
2022-05-07 21:45 ` [bug#55125] [PATCH 0/9] Cross-compile vcflib for RISC-V Ludovic Courtès
2022-05-12 7:57 ` Arun Isaac
2022-05-09 8:31 ` bug#55125: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220426124639.17159-1-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=55125@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.