From nobody Tue Nov 16 12:11:02 2021 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 0ED031850627; Tue, 16 Nov 2021 12:11:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HtlJl0Xpqz3MvY; Tue, 16 Nov 2021 12:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8481E518B; Tue, 16 Nov 2021 12:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AGCB2hl078504; Tue, 16 Nov 2021 12:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AGCB2Ap078503; Tue, 16 Nov 2021 12:11:02 GMT (envelope-from git) Date: Tue, 16 Nov 2021 12:11:02 GMT Message-Id: <202111161211.1AGCB2Ap078503@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f00588c63480 - main - biology/hhsuite: fix packaging on powerpc 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f00588c63480bbe584bbfa766e5ca86cff893cf4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f00588c63480bbe584bbfa766e5ca86cff893cf4 commit f00588c63480bbe584bbfa766e5ca86cff893cf4 Author: Piotr Kubaj AuthorDate: 2021-11-16 12:03:42 +0000 Commit: Piotr Kubaj CommitDate: 2021-11-16 12:03:42 +0000 biology/hhsuite: fix packaging on powerpc pkg-static: Unable to access file /wrkdirs/usr/ports/biology/hhsuite/work/stage/usr/local/bin/hhalign_omp:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/biology/hhsuite/work/stage/usr/local/bin/hhblits_ca3m:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/biology/hhsuite/work/stage/usr/local/bin/hhblits_omp:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/biology/hhsuite/work/stage/usr/local/bin/hhsearch_omp:No such file or directory powerpc doesn't have LLVM with libomp. --- biology/hhsuite/Makefile | 6 ++++++ biology/hhsuite/pkg-plist | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/biology/hhsuite/Makefile b/biology/hhsuite/Makefile index fc24fac30c34..a5eadbd193e2 100644 --- a/biology/hhsuite/Makefile +++ b/biology/hhsuite/Makefile @@ -29,4 +29,10 @@ CMAKE_ON= HAVE_SSE2 CMAKE_ON= HAVE_POWER8 .endif +.if ${ARCH} == powerpc +PLIST_SUB+= OPENMP="@comment " +.else +PLIST_SUB+= OPENMP="" +.endif + .include diff --git a/biology/hhsuite/pkg-plist b/biology/hhsuite/pkg-plist index c0088e8470e1..7b43c4fe3173 100644 --- a/biology/hhsuite/pkg-plist +++ b/biology/hhsuite/pkg-plist @@ -17,17 +17,17 @@ bin/ffindex_reduce bin/ffindex_unpack bin/hhalign bin/hhalign_mpi -bin/hhalign_omp +%%OPENMP%%bin/hhalign_omp bin/hhblits -bin/hhblits_ca3m +%%OPENMP%%bin/hhblits_ca3m bin/hhblits_mpi -bin/hhblits_omp +%%OPENMP%%bin/hhblits_omp bin/hhconsensus bin/hhfilter bin/hhmake bin/hhsearch bin/hhsearch_mpi -bin/hhsearch_omp +%%OPENMP%%bin/hhsearch_omp %%DATADIR%%/data/context_data.crf %%DATADIR%%/data/context_data.lib %%DATADIR%%/data/cs219.lib