From nobody Fri Jan 24 16:42:41 2025 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 4YfkBW2Khjz5ldKv; Fri, 24 Jan 2025 16:42:43 +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 4YfkBV5dwJz4J2R; Fri, 24 Jan 2025 16:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737736962; 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=bXa1hjMJiKuX0/eMyRzhHagPC45zEHv/zEmcWIu5jlc=; b=a1K6DJcc6rGIYIJiJydyH1BJuXGI1d4sdxSAikbRSOCAXRBj/RtuoOsgA68rC6p3iIvr+t AOt3lYKwmbjdnhSjrodZIdAoCrOklt8vvlN82TZsxltOHa/hoxzh+pp1ajkvmsjtTzK5E9 lR9CEsl4hfanUk4JGuXVEWHBmPDheCFvz0TWQJgx/I3JpMtdOAUy5YYZAG1PkuHDtym5pV 8WALQ0pDP/TKyc1WtQ7W2Q0gle8vaSCTcIYDx2bpN8C+O6SqllHD2LW3+3ib7rDaj4gICd 43kA0T7n8hqs89jNICdFehW+wqtj0ODfWlocqq4ygMz7X6XyV85HzV/+lEUE2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737736962; 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=bXa1hjMJiKuX0/eMyRzhHagPC45zEHv/zEmcWIu5jlc=; b=Z/8MzfAH2Xpm617bY7Bod+FoIy8uhNJMr6Cf5yy5uj/fmFApqP+cu1VRTDyU41hk35YNcY sss69tOYMmvRbC2NDpGc3e6WcbOEKCgVBdswAhZYB8zQpMqcGTTpKkzRxk5NvevM6p6h+L e3z/E69mIJ0f2YlcHQ6ynjSSPyLZRjujwnwL8mDb2JPKwuY54hbVPzNOI3Ib7NWbMaPjFj lVdvRScUVebVlPuegiPpxcB90yhE9zl8Tt00zNz7MqUjfELZ4946mPgDl+Y00M/UBq7Wp4 A5UCCHw9nhZ8wYr4DrIhaZ/SDAoCprCUUBfkctVnFf9hv/B+IkQd03dWb9rPnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737736962; a=rsa-sha256; cv=none; b=cZerVaPZX2tariY0+NgfAVFc7PVlpQ5kb5TW3iDdXE/p0tZ/1ptu6WPBQyIdXTaJUyimTE RujWT+VAwsd5u15NrjVx4ZRjs0UK4V6kC+hvbORS7rwiDXBJ8ucaxYEYxoVTgM0MUmUjWr JtZg5JrPcfKGvbPaZBZkN+k1vTETjdyIzXIZ7s0HMIQ8actXFvfxWQ2R5stAWTVag2V9sp m9SL9oVYMpokVm46RDHAg5w7cxwOxY4AZAOoQ18jwbxVGG4WyzJFIYPFFKpwLv5qFcLgjJ QI4lHYwc1LgCYoPdqZYlFwENwsYx9IcRDjkjFZBXgpNuqj/71a+9rRYBDTY4Jw== 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 4YfkBT73BMzZFB; Fri, 24 Jan 2025 16:42:41 +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 50OGgfCw049577; Fri, 24 Jan 2025 16:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OGgfv1049574; Fri, 24 Jan 2025 16:42:41 GMT (envelope-from git) Date: Fri, 24 Jan 2025 16:42:41 GMT Message-Id: <202501241642.50OGgfv1049574@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: 2ea6b0040121 - main - Mk/Uses/blaslapack.mk: respect DEFAULT_VERSIONS 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ea6b0040121605ffccc4711d214ca0826dae2f6 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ea6b0040121605ffccc4711d214ca0826dae2f6 commit 2ea6b0040121605ffccc4711d214ca0826dae2f6 Author: Mikhail Teterin AuthorDate: 2025-01-24 13:36:17 +0000 Commit: Thierry Thomas CommitDate: 2025-01-24 16:42:00 +0000 Mk/Uses/blaslapack.mk: respect DEFAULT_VERSIONS Remark: BLASLAPACK_DEFAULT is not included in Mk/bsd.default-versions.mk, and some ports may fail with a different implementation. PR: 283298 Reported by: Mikhail T. --- Mk/Uses/blaslapack.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk index 10f0c0a3166d..1e602695b0a0 100644 --- a/Mk/Uses/blaslapack.mk +++ b/Mk/Uses/blaslapack.mk @@ -15,10 +15,8 @@ _INCLUDE_USES_BLASLAPACK_MK= yes _valid_ARGS= atlas blis flexiblas netlib openblas openblas64 -_DEFAULT_BLASLAPACK= netlib - . if empty(blaslapack_ARGS) -blaslapack_ARGS= ${_DEFAULT_BLASLAPACK} +blaslapack_ARGS= ${BLASLAPACK_DEFAULT} . endif LDFLAGS+= -L${LOCALBASE}/lib @@ -40,7 +38,7 @@ BLA_VENDOR= FLAME LIB_DEPENDS+= libflexiblas.so:math/flexiblas _BLASLIB= flexiblas BLA_VENDOR= FlexiBLAS -. elif ${blaslapack_ARGS} == netlib +. elif ${blaslapack_ARGS} == netlib || empty(blaslapack_ARGS) LIB_DEPENDS+= libblas.so:math/blas LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= blas