From nobody Sun Aug 4 20:07:21 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WcVwT66pdz5SwTn; Sun, 04 Aug 2024 20:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WcVwT5Ffwz4Xq5; Sun, 4 Aug 2024 20:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722802041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUUpcVJxq3Afq+cU16kG1owL/uYMd5CZBF7ou0bFW7o=; b=lq+sx6ppZncBJh6WDcRpmhaGl5tOU0udBOvn4E4zKN+jJUIif0d4bmllQRm4EY8y7gnH82 ESghlt6TAc9RBM5s3NWklgv/XsgFo3fiv1a6vJkkrstj/+0YenTDOYiRsV/HRpVvWpdEn7 jTlg+X7H0DS+anfG4R8ikE/SaCR8WmxxMzuHu2iBytVY5fo09Rg/qMTTan7kjufXRRKNiO XkexLg+XjoPnOzI02FqBA8ZLswpXopd6wXXOW0oCmbhug56X8bxMbxQxk9tf34Yu5kprFG 7Eb4LdenDGSyB830ohz6737PFr+qP4TLRWq257CC+Hf1CQYkN97ug0sdFwKvBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722802041; a=rsa-sha256; cv=none; b=SXLfkmba00EIBKd2VG0/Z+o+m+7CVYPuIMzZldjUIBTbvlaNIS6jyoFjBTIuy5s4QQMumy DoQ+idKWJ0gjoKWyng8NbvwGYy0W47yQfgN4LWJJsxd6qpV1LfhXr3qDTeGbRE/zQnVlA+ 8WZE9J35T4iO6SRHJV1NJ6WlN0ts03zGsGdFI1miruCFipqQDQXc3yDQsxfTVEwQ0GMAU8 w1486GyaIB/aS+7hemMTksTbhQr+BAJwLMshYFsWIWGYhOeGVkzULkoFZcIDHtrPHHOZeo jCx72NitVsZIg9uYyLomI6zJ3U7WomaXz5+t2DitiCeZhSF/ScGQ9VH1o8/r2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722802041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUUpcVJxq3Afq+cU16kG1owL/uYMd5CZBF7ou0bFW7o=; b=BZI/4XwMrCcCe7D1WqWhsT5nn5HvZYwJg+3MwZPEWo3tVn7UJHikQpw3SrLdUkWb3BRs4Q Y3JC9js5M5OTD/OaLq+drHf+qwNRa9dsoUEi4ZeaTrdjB2Nyfs17HAM0m1BawqRRD1KagR 7JS5AHtd3D0kzdnoRawx5kz1o0LLqnh5PR8fdkWs7yYXAWykuKYFo9J7D7NjP7L9lE48Xt pyssS+R0YGxj2DOjRJoepcF4IGUWq1g4JTws985e3wB8ZwE9sUYE2wPFLxFV0DOmdN/A1g 5108I19nOxlVGsB0809VSbzC6yh1DBI+SZVjflnNVJe+cJYvaOBI/Jb26umqRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WcVwT4Y4Nz18JF; Sun, 4 Aug 2024 20:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 474K7LoW042662; Sun, 4 Aug 2024 20:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474K7LSj042659; Sun, 4 Aug 2024 20:07:21 GMT (envelope-from git) Date: Sun, 4 Aug 2024 20:07:21 GMT Message-Id: <202408042007.474K7LSj042659@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 3edd10773b45 - main - biology/gatk: Add dependencies biology/fermi-lite and biology/gkl; Add python dependency for tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3edd10773b45b981c57493e4eab9f9873bf42715 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3edd10773b45b981c57493e4eab9f9873bf42715 commit 3edd10773b45b981c57493e4eab9f9873bf42715 Author: Yuri Victorovich AuthorDate: 2024-08-04 20:05:10 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-04 20:07:19 +0000 biology/gatk: Add dependencies biology/fermi-lite and biology/gkl; Add python dependency for tests --- biology/gatk/Makefile | 15 ++++++++++++--- biology/gatk/files/gatk.sh.in | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/biology/gatk/Makefile b/biology/gatk/Makefile index 1200e614cba3..3bbda36b4492 100644 --- a/biology/gatk/Makefile +++ b/biology/gatk/Makefile @@ -1,5 +1,6 @@ PORTNAME= gatk DISTVERSION= 4.6.0.0 +PORTREVISION= 1 CATEGORIES= biology java EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -11,8 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.TXT BUILD_DEPENDS= gradle:devel/gradle +RUN_DEPENDS= ${LOCALBASE}/lib/libfml.so:biology/fermi-lite \ + gkl>0:biology/gkl -USES= gettext-runtime +USES= gettext-runtime python:test USE_JAVA= yes JAVA_VERSION= 17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=76025, tid=0x000000000006e359 guarantee(val < (1U << nbits)) failed: Field too big for insn @@ -27,10 +30,13 @@ NO_ARCH= yes DEPS_CACHE_DIR= ${WRKDIR} +TEST_ENV= ${MAKE_ENV} JAVA_TOOL_OPTIONS="-DLIBBWA_PATH=${PREFIX}/lib/libfml.so" + PLIST_FILES= bin/${PORTNAME} \ ${JAVAJARDIR}/GenomeAnalysisTK-${PORTVERSION}.jar -BINARY_ALIAS= java=${JAVA} +BINARY_ALIAS= java=${JAVA} \ + python=${PYTHON_CMD} # to rebuild the deps archive: # 1. set DEV_UPDATE_MODE=yes @@ -109,6 +115,9 @@ do-install: do-test: # tests require WITH_LARGE_FILES=ON, and they use a lot of disk space @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} gradle test + ${SETENV} ${TEST_ENV} gradle -DLIBBWA_PATH=${PREFIX}/lib/libfml.so test + +# tests results as of version 4.6.0.0_1: 288433 tests completed, 301 failed, 37 skipped, see https://github.com/broadinstitute/gatk/issues/8940 +# see https://github.com/broadinstitute/gatk/issues/8939: Tests fail to find libgkl libraries in /usr/local/lib .include diff --git a/biology/gatk/files/gatk.sh.in b/biology/gatk/files/gatk.sh.in index 913bb0dcce65..d3d5c0f7bf5a 100644 --- a/biology/gatk/files/gatk.sh.in +++ b/biology/gatk/files/gatk.sh.in @@ -22,4 +22,6 @@ if [ $MEM_OPTS_SET_BY_USER = "no" ]; then fi # execute the command -%%JAVA%% $MEM_OPTS -jar %%JAVAJARDIR%%/GenomeAnalysisTK-%%PORTVERSION%%.jar "$@" +# add the LIBBWA_PATH system parameter (not sure whether the env. var or argument alone are sufficient) +JAVA_TOOL_OPTIONS="-DLIBBWA_PATH=%%PREFIX%%/lib/libfml.so" \ +%%JAVA%% $MEM_OPTS -DLIBBWA_PATH=%%PREFIX%%/lib/libfml.so -jar %%JAVAJARDIR%%/GenomeAnalysisTK-%%PORTVERSION%%.jar "$@"