From nobody Tue Oct 10 17:18:22 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 4S4jKV5p31z4x3t9; Tue, 10 Oct 2023 17:18:22 +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 4S4jKV5NFMz3CBC; Tue, 10 Oct 2023 17:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696958302; 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=iomcTXmOQ3UVzbUXJ08fbTURUzf2Jk1RgUz0QyxQJmM=; b=JXOkrP1Xyd3AJ3Fcyb0tuu+pNBvbmsIZbVO9GJJS75zOVYgy7ZvAa4XhCoZaH5tAFafUjt dc+Zb+THDwM6bkUIZDzy9vo5e26i/MV3Gh8Ob2S2aAsWqmyjeSasnF8uX22mUd7DR3+14n XHdICXCxE2oo8U/aK6Z4QjbWZG6dktsQttQ49cQk73WfYoJnlvCucT84oqL9VVHpi2+uBg 12lrCe5NjMyo9H8HRaVoTgY0os+Cg3x395E05DtYjnnjpoYp5EkDwTYkH12O2boMrpp4Ro +8bQJA95YBhAXnfuv6yWhVlmsFpGIhJ73o4HOTz8RAP0pvOBf6nO/stdP5KuRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696958302; a=rsa-sha256; cv=none; b=kQW6euc86jrE75+G/YzF0vvtJ3ek2PcUIsy/ZjfrntXbrLRGlNidSOLYaXuQlsbTuEdhdi x8m2PAUOjjOEFoJJcR4nlkPkGpZ8ERheoRKvpolLZinfyX0pGyq5n+RI/MQwDlECk/1oLd FEU52eOmRzXCPqzWXBspHGdum+oDGJMugmQ/nT/J4oSo32sMm8gVNx2td5TPTgn2KmPEZ/ TeooWCSMFSZTY9LQhrdyDqBXKBRKvIWIfS6D3vtGAEhPh0DI9VE9zgZuLvZUExlzNu/Gc0 kx57E8wzuteAVKVAkotwueONUGQlGBmSaeknOFx7DZdwT8bhia7gyVImzoHp4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696958302; 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=iomcTXmOQ3UVzbUXJ08fbTURUzf2Jk1RgUz0QyxQJmM=; b=GYUZlvlFcBhTLTNltY4Tj2bM4EgVpZZUehTAaW1gk5W7E5SJi4XXXeGsXMNEGmjeprZ+8a UNvCFKLe3AbkOybvYGwTt7cthBO/r+oYvcDj65tZLaqYF5ZOQCNkhBUHIIYyDRrdBGuVIS ts+a9jJYaYRvq1wfPwoR5/IS1su8gymQwLOJmgdHv8EMzk8kBhmAy7H/wR+PQ7cHoOL/2B nV/D9uTxmMSz9qtPo9uJg24pm7oqCBbhh5FBLLMpu0Lq3eKkvHYI5WZafVUJivc00SXI16 1ytp7dUpmNN2tuckakUZNpibQ9IprlsoFCsQs9QttkGKkZhymESbNmGfwhutrA== 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 4S4jKV4TGgzmWp; Tue, 10 Oct 2023 17:18:22 +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 39AHIMlJ071319; Tue, 10 Oct 2023 17:18:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39AHIMHV071316; Tue, 10 Oct 2023 17:18:22 GMT (envelope-from git) Date: Tue, 10 Oct 2023 17:18:22 GMT Message-Id: <202310101718.39AHIMHV071316@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 2c83bd52e56e - main - math/openblas: Revert "update to 0.3.24" 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c83bd52e56ebe097db15d592401cab28f9f126a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c83bd52e56ebe097db15d592401cab28f9f126a commit 2c83bd52e56ebe097db15d592401cab28f9f126a Author: Robert Clausecker AuthorDate: 2023-10-10 17:08:35 +0000 Commit: Robert Clausecker CommitDate: 2023-10-10 17:18:06 +0000 math/openblas: Revert "update to 0.3.24" On some amd64 CPUs, this change broke py-scipy during configure, and octave at runtime. In the end, octave kills the package builders. This reverts commit c45681ef5049357ef58d738865b821186b02578f. Approved by: portmgr (antoine) PR: 273219 MFH: 2023Q4 --- math/openblas/Makefile | 4 +-- math/openblas/distinfo | 6 ++-- math/openblas/files/patch-c_check | 11 ++++++++ math/openblas/files/patch-common__arm.h | 4 +-- math/openblas/files/patch-exports_Makefile | 4 +-- math/openblas/files/patch-f_check | 45 ++++++++++++++++++------------ 6 files changed, 47 insertions(+), 27 deletions(-) diff --git a/math/openblas/Makefile b/math/openblas/Makefile index f85ecbb268fa..e4104ba6f50d 100644 --- a/math/openblas/Makefile +++ b/math/openblas/Makefile @@ -1,7 +1,7 @@ PORTNAME= openblas DISTVERSIONPREFIX= v -DISTVERSION= 0.3.24 -PORTEPOCH= 1 +DISTVERSION= 0.3.20 +PORTEPOCH= 2 CATEGORIES= math MASTER_SITES= NL/lapack/timing/:lapack_tmg DISTFILES= large.tgz:lapack_tmg \ diff --git a/math/openblas/distinfo b/math/openblas/distinfo index e4ffec3fd9c0..65d0da9523f3 100644 --- a/math/openblas/distinfo +++ b/math/openblas/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1694493901 +TIMESTAMP = 1648345083 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1 SIZE (openblas/large.tgz) = 2595 SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af SIZE (openblas/timing.tgz) = 1059485 -SHA256 (openblas/xianyi-OpenBLAS-v0.3.24_GH0.tar.gz) = ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132 -SIZE (openblas/xianyi-OpenBLAS-v0.3.24_GH0.tar.gz) = 24263037 +SHA256 (openblas/xianyi-OpenBLAS-v0.3.20_GH0.tar.gz) = 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c +SIZE (openblas/xianyi-OpenBLAS-v0.3.20_GH0.tar.gz) = 12742441 diff --git a/math/openblas/files/patch-c_check b/math/openblas/files/patch-c_check new file mode 100644 index 000000000000..817371d8f62f --- /dev/null +++ b/math/openblas/files/patch-c_check @@ -0,0 +1,11 @@ +--- c_check.orig 2019-04-29 17:22:19 UTC ++++ c_check +@@ -320,7 +320,7 @@ open(CONFFILE, "> $config" ) || die "Can't create $co + # print $data, "\n"; + + print MAKEFILE "OSNAME=$os\n"; +-print MAKEFILE "ARCH=$architecture\n"; ++print MAKEFILE "ARCH_=$architecture\n"; + print MAKEFILE "C_COMPILER=$compiler\n"; + print MAKEFILE "BINARY32=\n" if $binformat ne bin32; + print MAKEFILE "BINARY64=\n" if $binformat ne bin64; diff --git a/math/openblas/files/patch-common__arm.h b/math/openblas/files/patch-common__arm.h index 1ffd13a2c63b..7c6e402278e2 100644 --- a/math/openblas/files/patch-common__arm.h +++ b/math/openblas/files/patch-common__arm.h @@ -1,6 +1,6 @@ ---- common_arm.h.orig 2023-04-01 20:18:01 UTC +--- common_arm.h.orig 2018-08-30 22:07:48 UTC +++ common_arm.h -@@ -95,6 +95,17 @@ static inline int blas_quickdivide(blasint x, blasint +@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint #endif diff --git a/math/openblas/files/patch-exports_Makefile b/math/openblas/files/patch-exports_Makefile index 7e7692de9ce0..26dccbab2baf 100644 --- a/math/openblas/files/patch-exports_Makefile +++ b/math/openblas/files/patch-exports_Makefile @@ -1,6 +1,6 @@ ---- exports/Makefile.orig 2023-04-01 20:18:01 UTC +--- exports/Makefile.orig 2019-08-11 21:23:27 UTC +++ exports/Makefile -@@ -222,7 +222,7 @@ else +@@ -184,7 +184,7 @@ else endif $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ -Wl,--whole-archive $< -Wl,--no-whole-archive \ diff --git a/math/openblas/files/patch-f_check b/math/openblas/files/patch-f_check index 5af156564f03..6636f3cdeab3 100644 --- a/math/openblas/files/patch-f_check +++ b/math/openblas/files/patch-f_check @@ -1,19 +1,28 @@ ---- f_check.orig 2023-04-01 20:18:01 UTC -+++ f_check -@@ -360,6 +360,16 @@ if [ -n "$link" ]; then - flag="-lomp" - ;; - esac -+ -+ case "$hostos" in "FreeBSD") -+ case "$CC" in -+ gcc*) ;; -+ *) -+ # clang is assumed -+ flag="-lomp" -+ ;; -+ esac -+ esac - esac +--- f_check.orig 2021-05-03 06:50:22.000000000 +0900 ++++ f_check 2021-05-06 23:42:10.192934000 +0900 +@@ -326,7 +326,7 @@ - case "$flag" in -l*) + foreach $flags (@flags) { + if ( +- ($flags =~ /^\-L/) ++ ($flags =~ /^\-L\S/) + && ($flags !~ /^-LIST:/) + && ($flags !~ /^-LANG:/) + ) { +@@ -358,7 +358,7 @@ + } + + if ( +- ($flags =~ /^\-l/) ++ ($flags =~ /^\-l\S/) + && ($flags !~ /ibrary/) + && ($flags !~ /gfortranbegin/) + && ($flags !~ /frtbegin/) +@@ -369,6 +369,7 @@ + && ($flags !~ /kernel32/) + && ($flags !~ /advapi32/) + && ($flags !~ /shell32/) ++ && ($flags !~ /gomp/) + && ($flags !~ /omp/ || ($vendor !~ /PGI/ && $vendor !~ /FUJITSU/ && $flags =~ /omp/)) + && ($flags !~ /[0-9]+/ || ($vendor == FUJITSU && $flags =~ /^-lfj90/)) + && ($flags !~ /^\-l$/)