From patchwork Sun Jan 29 13:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 46517 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 04BFE27BBED; Sun, 29 Jan 2023 13:14:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD6CE27BBE9 for ; Sun, 29 Jan 2023 13:14:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pM7VU-0003Rf-D8; Sun, 29 Jan 2023 08:14:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pM7VT-0003Pz-20 for guix-patches@gnu.org; Sun, 29 Jan 2023 08:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pM7VS-0007qT-Hq for guix-patches@gnu.org; Sun, 29 Jan 2023 08:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pM7VS-0003cE-5n for guix-patches@gnu.org; Sun, 29 Jan 2023 08:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61148] [PATCH 5/5] gnu: vcflib: Update to 1.0.6. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Jan 2023 13:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61148@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 61148-submit@debbugs.gnu.org id=B61148.167499798713795 (code B ref 61148); Sun, 29 Jan 2023 13:14:02 +0000 Received: (at 61148) by debbugs.gnu.org; 29 Jan 2023 13:13:07 +0000 Received: from localhost ([127.0.0.1]:42438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM7UY-0003aQ-Rv for submit@debbugs.gnu.org; Sun, 29 Jan 2023 08:13:07 -0500 Received: from mail-ej1-f53.google.com ([209.85.218.53]:44792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM7UN-0003YV-82 for 61148@debbugs.gnu.org; Sun, 29 Jan 2023 08:12:56 -0500 Received: by mail-ej1-f53.google.com with SMTP id hx15so5399801ejc.11 for <61148@debbugs.gnu.org>; Sun, 29 Jan 2023 05:12:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=IY4uSkmft8vSQWEMcjXP/Wradrx5sfC818K9qWgQm54=; b=LuprAeUPFlzBVwh+eAkcPYdkmSHs/3yD4K6IEx4nLHa/BBRbNQdUBC1icL49HSNcSJ eQr4UshNFC/ddkZPvNhvPZaEHrNWVYxagAbYmJgIvysMA87EVF4cWpYzaCDWo/rdQOIJ InHjssLrko10PAXS3pBFYxlJOetegsAeeNKUnjYwa5q/j9XyK4v5SAZA+oL79H5XoJB8 nvWubiwj2uxWej6wRa0Ehqnhco2RCPPQ3grTMPBX0d8BuwJ+Wmdtwwg2IiEx+Tn8dp3T mBhL5vlukGnbxBTJV5VozLeP6ZEbW5FRpvwP853K1kvbSn2IjqVbgQkwPIaE6D7E7+hY 7RnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IY4uSkmft8vSQWEMcjXP/Wradrx5sfC818K9qWgQm54=; b=R08/IQMtt34KPWKwYe5H/z3dPiVg89u5uo+VK57pJfU7KxzTysz6U1MQRw6sQa+vul mrp+bX/0mM0la33IZekT9Ub/FhsH9RQPyoGxva7upa1S4CyX6+KWiIc0r20Yt7nZRjpM QvvaaLVAqKP+NGD7P5stnkAP9+8/1SMugDgHzvMOkSniwpuPMoPesawIMa6lq4H+upTO TvKJ3MiLutxKOYN43TOyBRnMibR15yIEGQPkeL/hjgcJhbVuhmdfbBd+Q2+AuxYk63Zb r9PkPwH2QQMI5RSTG9ErLiiVpsR7kMMiKdWND2xFcdZ3f+FpZqWBjixxRZ4Sj3K2b64m Gs+Q== X-Gm-Message-State: AFqh2kpIp33k0ck+5QR0X3cIxBKCNpC5cSOhU36MpyO39Gn26+dcCOP4 aBxA/n5fmA9sNT5Fyf02uNhoCWkuQW4I5A== X-Google-Smtp-Source: AMrXdXvSiygmDHOfgsdpF8Tvxx60Uxmwl8oKQ/9jGmO92m69eeZ8TV6mzP9Q05gi3V33xflUjwoj8A== X-Received: by 2002:a17:906:644f:b0:877:6549:bb6 with SMTP id l15-20020a170906644f00b0087765490bb6mr39735353ejn.58.1674997969763; Sun, 29 Jan 2023 05:12:49 -0800 (PST) Received: from localhost ([141.226.15.115]) by smtp.gmail.com with ESMTPSA id m16-20020a1709062b9000b0084d4b8f5889sm5297048ejg.102.2023.01.29.05.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 05:12:49 -0800 (PST) From: Efraim Flashner Date: Sun, 29 Jan 2023 15:12:38 +0200 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bioinformatics.scm (vcflib): Update to 1.0.6. [source]: Adjust snippet to use unbundled wfa2-lib include directory. Also unbundle simde, wfa2-lib. Remove googletest from unbundle list, it is no longer in use. [inputs]: Add curl, simde, wfa2-lib. [native-inputs]: Add pybind11, pandoc when available. Add the sources for libvcfh. [arguments]: Adjust configure-flags to build without zig and to use the unbundled wfa2-lib. Adjust custom 'build-shared-library phase for changes in the source. Adjust custom 'unpack-submodule-sources for changes in the source. --- gnu/packages/bioinformatics.scm | 69 +++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 05a07af7f3..c4eeb6d68f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16033,74 +16033,108 @@ (define-public fastahack (define-public vcflib (package (name "vcflib") - (version "1.0.3") + (version "1.0.6") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/vcflib/vcflib") - (commit (string-append "v" version)))) + (commit (string-append "v" version)) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1r7pnajg997zdjkf1b38m14v0zqnfx52w7nbldwh1xpbpahb1hjh")) + (base32 "0zcs8j3vdajram53srvjmq353f3prqdbn8fvzja4412w4zay79fz")) (modules '((guix build utils))) (snippet #~(begin (substitute* "CMakeLists.txt" ((".*fastahack.*") "") ((".*smithwaterman.*") "") + ;; Also look for fastahack and smithwaterman since + ;; we've just unbundled them. (("(pkg_check_modules\\(TABIXPP)" text) (string-append "pkg_check_modules(FASTAHACK REQUIRED fastahack)\n" "pkg_check_modules(SMITHWATERMAN REQUIRED smithwaterman)\n" text)) + ;; Also link vcflib to fastahack and smithwaterman. (("\\$\\{TABIXPP_LIBRARIES\\}" text) (string-append "${FASTAHACK_LIBRARIES} " "${SMITHWATERMAN_LIBRARIES} " - text))) + text)) + ;; Honor setting WFA_INCLUDE_DIRS and not look at + ;; PREFIX/include/wfa2lib. + (((string-append "\\$\\{CMAKE_INSTALL_PREFIX\\}/" + "\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}/wfa2lib")) + "${WFA_INCLUDE_DIRS}")) (substitute* (find-files "." "\\.(h|c)(pp)?$") (("\"SmithWatermanGotoh.h\"") "") (("\"convert.h\"") "") (("\"disorder.h\"") "") (("Fasta.h") "fastahack/Fasta.h")) - (for-each delete-file-recursively - '("fastahack" "filevercmp" "fsom" "googletest" "intervaltree" - "libVCFH" "multichoose" "smithwaterman")))))) + (substitute* "src/Variant.h" + (("wavefront/wfa.hpp") "wfa2lib/wavefront/wfa.hpp")) + (delete-file-recursively "src/simde") + (with-directory-excursion "contrib" + (for-each delete-file-recursively + '(;"c-progress-bar" + "fastahack" + "filevercmp" + "fsom" + "intervaltree" + "libVCFH" + "multichoose" + "smithwaterman" + "tabixpp" + "WFA2-lib"))))))) (build-system cmake-build-system) (inputs (list bzip2 + curl htslib fastahack perl python + simde smithwaterman tabixpp + wfa2-lib xz zlib)) (native-inputs `(("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) + ,@(if (member (%current-system) + (package-transitive-supported-systems pandoc)) + `(("pandoc" ,pandoc)) + '()) ;; Submodules. - ;; This package builds against the .o files so we need to extract the source. + ;; Not all of these packages provide libraries to link against. ("filevercmp-src" ,(package-source filevercmp)) ("fsom-src" ,(package-source fsom)) ("intervaltree-src" ,(package-source intervaltree)) + ("libvcfh-src" ,(package-source libvcfh)) ("multichoose-src" ,(package-source multichoose)))) (arguments (list #:configure-flags - #~(list (string-append + #~(list "-DZIG=NO" + "-DWFA_GITMODULE=OFF" + (string-append "-DWFA_INCLUDE_DIRS=" + (search-input-directory %build-inputs + "include/wfa2lib")) + "-DTABIX_FOUND=ON" ; Default to found + (string-append "-DPKG_CONFIG_EXECUTABLE=" (search-input-file %build-inputs (string-append "/bin/" #$(pkg-config-for-target))))) - #:tests? #f ; no tests + #:tests? #f ; Tests need more configuring. #:phases #~(modify-phases %standard-phases (add-after 'unpack 'build-shared-library (lambda _ (substitute* "CMakeLists.txt" - (("vcflib STATIC") "vcflib SHARED")) - (substitute* "test/Makefile" - (("libvcflib.a") "libvcflib.so")))) + (("vcflib STATIC") "vcflib SHARED")))) (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((unpack (lambda (source target) @@ -16114,10 +16148,11 @@ (define-public vcflib source "--strip-components=1"))))))) (and - (unpack "filevercmp-src" "filevercmp") - (unpack "fsom-src" "fsom") - (unpack "intervaltree-src" "intervaltree") - (unpack "multichoose-src" "multichoose"))))) + (unpack "filevercmp-src" "contrib/filevercmp") + (unpack "fsom-src" "contrib/fsom") + (unpack "intervaltree-src" "contrib/intervaltree") + (unpack "libvcfh-src" "contrib/libvcfh") + (unpack "multichoose-src" "contrib/multichoose"))))) ;; This pkg-config file is provided by other distributions. (add-after 'install 'install-pkg-config-file (lambda* (#:key outputs #:allow-other-keys)