From nobody Sun Oct 29 10:48:58 2023 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 4SJCnR1rmqz4ynm6; Sun, 29 Oct 2023 10:48:59 +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 4SJCnR1FZXz3H2G; Sun, 29 Oct 2023 10:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698576539; 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=h3kgeHs/h36HSmLmcRWnDZlTBGpHDhrBV0sIrHwR8Eg=; b=gS04pzOFSBdxWru1NOR/fHiV2R0ntvCo54vTQGkP8vPlBnalkP2l+8vEJRtvwD9yCUX3e9 PCWs7u5H9GABL6ON9TgmJJWv1TChEYLY24gUSQvbL501fbF12nFIbaoxgZApO4V+o3k4J9 m0BgcV/jrgNcwog4lWuCaSG4gHUR28Wgzcaa0WQhQErFPBmMgoYpDP07f+pDFNVqh5Q08l fd8QJRKBJ+l9qFCvd/kHuxgjs32GOGUpmC1HTkvUx+MVFc5A/sAbaDOeTF3tvn/yxt69hr hsGz5lyeYYLb97I337/WHeYNoNe2i05E/1ooleJVYuXpNgXxBHWNWe0yvBdugQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698576539; 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=h3kgeHs/h36HSmLmcRWnDZlTBGpHDhrBV0sIrHwR8Eg=; b=FztuwQRbXVN7dyvjufbV10RT/ZlHWWOqtIlnVTvgFQ2OB0mbn1BtSnS/YMMrgmn+d45gVq GQnEKb1ecT8sBMTmdXTgEDEJCWZBbn1B1cCnWkk1twcA+Q4Okz4vsX00N3a1MHZR4ICawj NOegVRFbfhL5EAc0KSvKE4WdBbZzRLj+SUTU1/49BSW+tj3QBnQNNyciY2KzZOS0HirtmT ugqZyr6YdzZPea3qvsV6/EsRosk+hABG7NRPPXPLvXqKJhUY0BG5o5iJojClwPjAp9fmq2 EZrat1MQ6KSlOkAQI7KhzzdZEsjpx1M5k1XT0xTbAIPaja/HOnGVX7v1LxEiTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698576539; a=rsa-sha256; cv=none; b=VHZYYVLDZ3D6e4TDOxrZgwpF3QbMUdsWhN470kfF4Go6egSwqOTVnAUoTrnxDGumtEBGph frNT8NZx6CtAwGr5V1xVVzdgofCV8Eg9x1Q1GupCzSXUbZItOVC7alSHGM660g0ot7Ivok DxNIbXGCiGcCn/jaeY754F4C40bEF9+y14UaO8YmM/qz3dn3JIQklzMqR7RKHAmlns4Fot QU7CTvyZZbksoy+vWW1JlYN69w6QB0PknKN0z8mlpRSC5AkSQUeuukAjJyZgn9/e0Q+YcO ntl4OpRwS6ueoqjZYxyS30pjnvVuI809Pv3ueP7zgYtn0XNyAXwSTJxvogLGMA== 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 4SJCnR0GQDzbn3; Sun, 29 Oct 2023 10:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39TAmw24013924; Sun, 29 Oct 2023 10:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39TAmwZB013921; Sun, 29 Oct 2023 10:48:58 GMT (envelope-from git) Date: Sun, 29 Oct 2023 10:48:58 GMT Message-Id: <202310291048.39TAmwZB013921@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: 390e0ec2f981 - main - */*: chase the removal of math/gotoblas 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: 390e0ec2f9817bdec41597ed8daf0da02f092272 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=390e0ec2f9817bdec41597ed8daf0da02f092272 commit 390e0ec2f9817bdec41597ed8daf0da02f092272 Author: Thierry Thomas AuthorDate: 2023-10-29 10:46:49 +0000 Commit: Thierry Thomas CommitDate: 2023-10-29 10:48:40 +0000 */*: chase the removal of math/gotoblas Thanks to yuri@ the latest consumers have been fixed. PR: 274110 Reported by: Ivan Rozhuk --- Mk/Uses/blaslapack.mk | 10 ++-------- math/suitesparse/bsd.suitesparse.mk | 4 +--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk index fece76dbc93d..0d3007ec5907 100644 --- a/Mk/Uses/blaslapack.mk +++ b/Mk/Uses/blaslapack.mk @@ -2,7 +2,7 @@ # # Feature: blaslapack # Usage: USES=blaslapack or USES=blaslapack:ARGS -# Valid ARGS: atlas gotoblas netlib (default) openblas +# Valid ARGS: atlas netlib (default) openblas # # Provides: BLASLIB and LAPACKLIB # @@ -11,7 +11,7 @@ .if !defined(_INCLUDE_USES_BLASLAPACK_MK) _INCLUDE_USES_BLASLAPACK_MK= yes -_valid_ARGS= atlas gotoblas netlib openblas +_valid_ARGS= atlas netlib openblas _DEFAULT_BLASLAPACK= netlib @@ -28,12 +28,6 @@ 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 diff --git a/math/suitesparse/bsd.suitesparse.mk b/math/suitesparse/bsd.suitesparse.mk index 925e8ef86d0e..3d59ba3e82d8 100644 --- a/math/suitesparse/bsd.suitesparse.mk +++ b/math/suitesparse/bsd.suitesparse.mk @@ -64,12 +64,10 @@ OPTIONS_DEFAULT+= OPTIMIZED_CFLAGS ${MPORTNAME} == SPQR || \ ${MPORTNAME} == UMFPACK OPTIONS_RADIO+= BLAS -OPTIONS_RADIO_BLAS+= ATLAS GOTOBLAS NETLIB OPENBLAS +OPTIONS_RADIO_BLAS+= ATLAS NETLIB OPENBLAS OPTIONS_DEFAULT+= OPENBLAS ATLAS_USES= blaslapack:atlas -GOTOBLAS_DESC= Goto blas implementation -GOTOBLAS_USES= blaslapack:gotoblas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas .endif