From nobody Tue May 9 20:00:54 2023
X-Original-To: dev-commits-ports-all@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 4QG8D65vnSz49QbZ;
Tue, 9 May 2023 20:00:54 +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 4QG8D63zwqz3CSg;
Tue, 9 May 2023 20:00:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1683662454;
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=0ufgy4lr4QITekrhmvaqAhznz7LBFrtYk8Ru51kSBxM=;
b=sQ/kew+bLTMFi/jllQIxPkHHVvScCkXetUmIGVVOgF1ZaM9DJV618GVVah1jBZy1bdOf2a
R/NYKE1gD8PKfbCqZb6/Iw3BTdk1wfUJ6UBdVIvX9vtb889ZeXc0vShQpCCtSebi86gkVQ
GW3trznh9Dx8x+SYcGUDBxTB4pQ7DWRc4px5bBzJhKknfHY9L1Z+0Rg4JpsimLoAp3lL8G
Vh80p67bRBa+BB3FH4KuZvx0jAcnW7mYNysK8S1oKUnMhAqi2IfUt6bHysWduTZSn1uuue
75HG/V22jN3ZDF7pL+uN43y9RBlqa1DI+iP4cMwMVlWKWZVsusTWn0/Y/gn5Wg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1683662454;
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=0ufgy4lr4QITekrhmvaqAhznz7LBFrtYk8Ru51kSBxM=;
b=Q+JqtKGd4P6E7y/0WGgiaMO7Qqoqjpung/ID5sfsyZHRZP2xhlpfcFok4hCwdgbVfR4occ
7R7dh0q0o0b4nsVUrkTM18CbuY991bQ0FOrzSWFms3t63uTVEOmAEPsQ5tKNkVxV4ldOAH
uVASTBsoocCMNnvv+GMwppee5KKWK7490nnF93a5STqz6cdMBpJJD64Xk+6eZob8DdFAxM
EzOg6bCI3DryGacS64bPnv8cZa/5vpw+lVizOw8yxLSWoApZP9YpadlsjM/VbTfV34RrNn
TSKY9Wa4ieu75E1Z553TkyUC9ep9tuF+ZvdfPhNneyXyigq1IXvWrcgy9UbBjg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683662454; a=rsa-sha256; cv=none;
b=e9u/9USITqS4FB9lkIm7RTeJMHwONaOzPss7zt+Aoto5DiuuBGg4PzadrB5j5iVkXGUCYZ
bxjPiwE4NbIzy1qRygwWoypB2uIQMe1WfYTiX4eifFTWPwGmizEtTagOVvL2xaQ9GyYHEr
d4xob9KaLCaHwKGboenoKIqvQHoqW3B2sr5ktOR9LKLALwTsUVVVryEYOF10mRyEK6Bk/3
aktf4wMiuNjp98KKYabDywXHEydhAayZVXepZtj44kNELDmg3nkfpaiXZFlX3CNj6dI0Ct
69TeG8rR+uxXCALwYO4V+qr+yZs6Zgqch1zUUkPRpGTH/FFh1wfjwYz3RsmZLg==
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 4QG8D6353pzhHG;
Tue, 9 May 2023 20:00:54 +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 349K0s0f070678;
Tue, 9 May 2023 20:00:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349K0sai070677;
Tue, 9 May 2023 20:00:54 GMT
(envelope-from git)
Date: Tue, 9 May 2023 20:00:54 GMT
Message-Id: <202305092000.349K0sai070677@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Subject: git: 40cccee32402 - main - math/fann: fix plist without libomp
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@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: 40cccee32402d3f22c63040869c37ac5a962c9b9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=40cccee32402d3f22c63040869c37ac5a962c9b9
commit 40cccee32402d3f22c63040869c37ac5a962c9b9
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-05-09 19:54:43 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-05-09 19:54:43 +0000
math/fann: fix plist without libomp
pkg-static: Unable to access file /wrkdirs/usr/ports/math/fann/work/stage/usr/local/include/parallel_fann.h:No such file or directory
pkg-static: Unable to access file /wrkdirs/usr/ports/math/fann/work/stage/usr/local/include/parallel_fann.hpp:No such file or directory
---
math/fann/Makefile | 6 ++++++
math/fann/pkg-plist | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/math/fann/Makefile b/math/fann/Makefile
index 85e71ff6a3f8..63d8bd6c79c3 100644
--- a/math/fann/Makefile
+++ b/math/fann/Makefile
@@ -16,4 +16,10 @@ USE_GITHUB= yes
GH_ACCOUNT= libfann
GH_TAGNAME= 8409b42
+.if !exists(/usr/include/omp.h)
+PLIST_SUB= OPENMP="@comment "
+.else
+PLIST_SUB= OPENMP=""
+.endif
+
.include <bsd.port.mk>
diff --git a/math/fann/pkg-plist b/math/fann/pkg-plist
index 0e982deeb0d5..b490ccd1056d 100644
--- a/math/fann/pkg-plist
+++ b/math/fann/pkg-plist
@@ -12,8 +12,8 @@ include/fann_train.h
include/fann_training_data_cpp.h
include/fixedfann.h
include/floatfann.h
-include/parallel_fann.h
-include/parallel_fann.hpp
+%%OPENMP%%include/parallel_fann.h
+%%OPENMP%%include/parallel_fann.hpp
lib/cmake/fann/fann-config.cmake
lib/cmake/fann/fann-use.cmake
lib/libdoublefann.a