From nobody Sat Nov 12 13:33:02 2022 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 4N8c2k6ZhTz4fpdv; Sat, 12 Nov 2022 13:33:02 +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 4N8c2k68Hjz4331; Sat, 12 Nov 2022 13:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668259982; 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=z+/q7SwccYUC+oKPV89s8ZDvDn5quSk/fVkgSM9N7WQ=; b=jrV2oUJflJ1F+fnlkOzYzdHe7lSfPgk4Y1wO8x21wHfCCdCSkVryfFTwQh/N4dAY47r/37 tOuy7Wyv7JFlAHyaVWk5gsl2l6AQ/TOttXopKtw2CAGYBeVFtCwgJnoGeWVRxsKf7+AOhv JrQ2Pzpcn2E4GdzGYr/gHiDdPcUAJIaMrmwKnXOok01CxVXlsJk68BpXVdDwbekwkQ/GLH pILCVZ4QXe/bIZqQ7u+uX0FQKIw19KDwfodMU2Uk2C9Zkc2vAXWXYdO/M5xsbUnktQa+3f KvF1t9vdEKQrCOpCV+XbGe/yvLkjJgzLOxWAgb7sa6WASOcqXXlpXzKjN7awTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668259982; 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=z+/q7SwccYUC+oKPV89s8ZDvDn5quSk/fVkgSM9N7WQ=; b=SldI8nJ4afnjgEA6YSevuSX54+IgCAxwuVLdU9seFYiAYQKAY+V4l9gJjDXc6TmzYiEp+5 9Wh1mSP37jWon19egtCfTXSl3DKd7pGjmHyjZz5aqjDqeWq0B2SyTd3hbwNX5KXvrEYcD9 0patjd22IkTo+zAOFeTUm/+06kNPoBC7e9XspiA4AJtKqUDpjNupjt+zNzYYJsyyMeMT/L ntDUOau4bc9+bUi1HpKZMNpX5RsQ9W0CTyegakaRsHZbEZAwkHHh5qPRC0BBNsypFwAApn 6esY9Szrpp3nBJNTJPjzeBCgl0CSTvNp8ltQM/9L7U3Tsbycc7KiDlDw7FKkJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668259982; a=rsa-sha256; cv=none; b=aY5dsJKq4MilL5zWyzDfUltoa+fNkggaE3Xw/w+aVyShf2zy2TxIRcIq1VFpDG+Emo5drJ yk/tXY/2es86lCr8LMCLIqTzOy7yIg8cU7D2QC42D0eMo8eOqT6sfrkaJuRypFpQDqxFj4 s9vYEc/PxI7juHUhknNxTzKZgiDh7jXPETqbIcVbKmY2ytqEvTxHvR72scs2gVB0iwL9v1 gRng6A+rWVbV3xo2KyKq471DjpoHHme7HtftuOF1LbavCCbb8LhnGvINLljGW4g9F0ap3d +ziw/x+dShsT+9+nuYoRwtB9fZHL2RZgmwmL36iwzBSOhfgHsoxeiVIrA8dmPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N8c2k5BqNzQ2s; Sat, 12 Nov 2022 13:33: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 2ACDX2Mc028425; Sat, 12 Nov 2022 13:33:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ACDX2YR028424; Sat, 12 Nov 2022 13:33:02 GMT (envelope-from git) Date: Sat, 12 Nov 2022 13:33:02 GMT Message-Id: <202211121333.2ACDX2YR028424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: c2721bb791bc - main - Mk/Uses/blaslapack.mk: set BLA_VENDOR to be used by cmake 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2721bb791bcce7ec23f6df173500ca200ff3b66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2721bb791bcce7ec23f6df173500ca200ff3b66 commit c2721bb791bcce7ec23f6df173500ca200ff3b66 Author: Thierry Thomas AuthorDate: 2022-11-11 15:13:16 +0000 Commit: Thierry Thomas CommitDate: 2022-11-12 13:33:00 +0000 Mk/Uses/blaslapack.mk: set BLA_VENDOR to be used by cmake See $LOCALBASE/share/cmake/Modules/FindBLAS.cmake: this will guide cmake to choose the right libraries. --- Mk/Uses/blaslapack.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk index 467173412d07..fece76dbc93d 100644 --- a/Mk/Uses/blaslapack.mk +++ b/Mk/Uses/blaslapack.mk @@ -27,24 +27,32 @@ _BLASLIB= ptf77blas LAPACKLIB= -lalapack -lptcblas _ATLASLIB= atlas ATLASLIB= -l${_ATLASLIB} +BLA_VENDOR= ATLAS . elif ${blaslapack_ARGS} == gotoblas LIB_DEPENDS+= libgoto2.so:math/gotoblas LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= goto2p LAPACKLIB= -lgoto2p +BLA_VENDOR= Goto . elif ${blaslapack_ARGS} == netlib LIB_DEPENDS+= libblas.so:math/blas LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= blas LAPACKLIB= -llapack +BLA_VENDOR= Generic . elif ${blaslapack_ARGS} == openblas LIB_DEPENDS+= libopenblas.so:math/openblas _BLASLIB= openblas LAPACKLIB= -lopenblas +BLA_VENDOR= OpenBLAS . else IGNORE= USES=blaslapack: invalid arguments: ${blaslapack_ARGS} . endif BLASLIB= -l${_BLASLIB} +. if ${USES:Mcmake} || ${USES:Mcmake\:*} +CONFIGURE_ENV+= BLA_VENDOR="${BLA_VENDOR}" +. endif + .endif