From owner-svn-ports-head@freebsd.org Thu Jun 4 11:37:25 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F9343361B8; Thu, 4 Jun 2020 11:37:25 +0000 (UTC) (envelope-from pkubaj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49d3fY0ygzz4VSr; Thu, 4 Jun 2020 11:37:25 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C5E51ED1F; Thu, 4 Jun 2020 11:37:25 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 054BbOBL028839; Thu, 4 Jun 2020 11:37:24 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 054BbOdt028838; Thu, 4 Jun 2020 11:37:24 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202006041137.054BbOdt028838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 4 Jun 2020 11:37:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537882 - head/math/openblas X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/math/openblas X-SVN-Commit-Revision: 537882 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 11:37:25 -0000 Author: pkubaj Date: Thu Jun 4 11:37:24 2020 New Revision: 537882 URL: https://svnweb.freebsd.org/changeset/ports/537882 Log: math/openblas: fix build on powerpc Merge upstream commit to fix build on powerpc. Use GCC from ports to build it. Since this is mostly about G3 and G4 machines that users have and OpenBLAS supports only G4 of those, target G4. Due to some (still unknown) regression on head, this builds on 12.1, but fails tests on head. Modified: head/math/openblas/Makefile head/math/openblas/distinfo Modified: head/math/openblas/Makefile ============================================================================== --- head/math/openblas/Makefile Thu Jun 4 11:25:59 2020 (r537881) +++ head/math/openblas/Makefile Thu Jun 4 11:37:24 2020 (r537882) @@ -14,6 +14,7 @@ DIST_SUBDIR= openblas PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= ee2e758278b5d82b7242f505ea694f082ef65879.patch:-p1 # fixes the regression: https://github.com/xianyi/OpenBLAS/pull/2512 +PATCHFILES+= 3eda3d34c3d9bfabb29e1d8a69860932334a815d.patch:-p1 # fixes build on powerpc (PPCG4) MAINTAINER= phd_kimberlite@yahoo.co.jp COMMENT= Optimized BLAS library based on GotoBLAS2 @@ -68,6 +69,11 @@ TARGET_CPU_ARCH= POWER6 .else TARGET_CPU_ARCH= PPC970 . endif +.endif + +.if ${ARCH} == powerpc +USE_GCC= yes +TARGET_CPU_ARCH= PPCG4 .endif MAXTHREADS?= 64 Modified: head/math/openblas/distinfo ============================================================================== --- head/math/openblas/distinfo Thu Jun 4 11:25:59 2020 (r537881) +++ head/math/openblas/distinfo Thu Jun 4 11:37:24 2020 (r537882) @@ -1,4 +1,4 @@ -TIMESTAMP = 1588802954 +TIMESTAMP = 1591268760 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1 SIZE (openblas/large.tgz) = 2595 SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af @@ -7,3 +7,5 @@ SHA256 (openblas/xianyi-OpenBLAS-v0.3.9_GH0.tar.gz) = SIZE (openblas/xianyi-OpenBLAS-v0.3.9_GH0.tar.gz) = 12184323 SHA256 (openblas/ee2e758278b5d82b7242f505ea694f082ef65879.patch) = 9210a94ae418b4ce6d9f7fab4e00dd3155451f5ef3769536a4d954a2149ca733 SIZE (openblas/ee2e758278b5d82b7242f505ea694f082ef65879.patch) = 2028 +SHA256 (openblas/3eda3d34c3d9bfabb29e1d8a69860932334a815d.patch) = 849b91e8422b87ad58687435a921e295dbdd74eec9597331d10b7438c39f246b +SIZE (openblas/3eda3d34c3d9bfabb29e1d8a69860932334a815d.patch) = 2988