Date: Sun, 12 May 2019 02:00:14 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501357 - in head/math/mprime: . files Message-ID: <201905120200.x4C20ETn047990@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun May 12 02:00:14 2019 New Revision: 501357 URL: https://svnweb.freebsd.org/changeset/ports/501357 Log: math/mprime: update to 29.8b3 PR: 237844 Submitted by: rozhuk.im@gmail.com (maintainer) Deleted: head/math/mprime/files/patch-ecm.c head/math/mprime/files/patch-gwnum_gwnum.c head/math/mprime/files/patch-gwnum_gwutil.c head/math/mprime/files/patch-gwnum_makebsd64 head/math/mprime/files/patch-gwnum_makemsys head/math/mprime/files/patch-gwtest.c head/math/mprime/files/patch-linux64_makebsd head/math/mprime/files/patch-linux_makebsd Modified: head/math/mprime/Makefile (contents, props changed) head/math/mprime/distinfo (contents, props changed) head/math/mprime/files/patch-commonc.c (contents, props changed) Modified: head/math/mprime/Makefile ============================================================================== --- head/math/mprime/Makefile Sun May 12 01:51:19 2019 (r501356) +++ head/math/mprime/Makefile Sun May 12 02:00:14 2019 (r501357) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mprime -PORTVERSION= 29.4b7 -PORTREVISION= 1 +PORTVERSION= 29.8b3 CATEGORIES= math benchmarks net MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \ ftp://mersenne.org/gimps/ Modified: head/math/mprime/distinfo ============================================================================== --- head/math/mprime/distinfo Sun May 12 01:51:19 2019 (r501356) +++ head/math/mprime/distinfo Sun May 12 02:00:14 2019 (r501357) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542398806 -SHA256 (p95v294b7.source.zip) = 15682e9587af2b86647de9786f97dc8c5d7a4a679a0440f7d1d1936a48c5aa45 -SIZE (p95v294b7.source.zip) = 47931498 +TIMESTAMP = 1557620197 +SHA256 (p95v298b3.source.zip) = dac67702e45689e058519164222b6a1f0b32d9e7c88049f7c59f9699174105f0 +SIZE (p95v298b3.source.zip) = 51553788 Modified: head/math/mprime/files/patch-commonc.c ============================================================================== --- head/math/mprime/files/patch-commonc.c Sun May 12 01:51:19 2019 (r501356) +++ head/math/mprime/files/patch-commonc.c Sun May 12 02:00:14 2019 (r501357) @@ -1,18 +1,19 @@ ---- commonc.c.orig 2016-09-14 03:33:00 UTC -+++ commonc.c -@@ -3247,13 +3247,13 @@ void tempFileName ( - /* From now on, we will use k and c to generate the filename. To reduce */ - /* upgrading problems, old save file names are renamed. */ +--- commonc.c.orig 2019-04-11 17:46:50.000000000 +0300 ++++ commonc.c 2019-05-12 03:52:33.503858000 +0300 +@@ -386,6 +386,8 @@ + CPU_L2_CACHE_INCLUSIVE = -1; + CPU_L3_CACHE_INCLUSIVE = -1; + CPU_L4_CACHE_INCLUSIVE = -1; ++ ++#if HWLOC_API_VERSION >= 0x00020000 + for (depth = 0; depth < hwloc_topology_get_depth (hwloc_topology); depth++) { + for (i = 0; i < (int) hwloc_get_nbobjs_by_depth (hwloc_topology, depth); i++) { + hwloc_obj_t obj; +@@ -423,6 +425,7 @@ + } + } + } ++#endif -- if (w->k != 1.0 || abs(w->c) != 1) { -+ if (w->k != 1.0 || labs(w->c) != 1) { - char v258_filename[32]; - strcpy (v258_filename, buf); - buf[1] = 0; - if (w->k != 1.0) sprintf (buf+strlen(buf), "%g", fmod (w->k, 1000000.0)); - sprintf (buf+strlen(buf), "_%ld", p); -- if (abs(w->c) != 1) sprintf (buf+strlen(buf), "_%d", abs(w->c) % 1000); -+ if (labs(w->c) != 1) sprintf (buf+strlen(buf), "_%ld", labs(w->c) % 1000); - rename (v258_filename, buf); - if (buf[0] == 'p') { - v258_filename[0] = buf[0] = 'q'; + /* Overwrite the cache info calculated via CPUID as hwloc's info is more detailed and I believe more reliable. */ + /* We are transitioning away from using the cache size global variables computed by the CPUID code. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905120200.x4C20ETn047990>