svn commit: r561262 - in head/math/mprime: . files
Jason W. Bacon
jwb at FreeBSD.org
Mon Jan 11 20:26:12 UTC 2021
Author: jwb
Date: Mon Jan 11 20:26:11 2021
New Revision: 561262
URL: https://svnweb.freebsd.org/changeset/ports/561262
Log:
math/mprime: Switch from hwloc to hwloc2
Moving all ports to hwloc2 since it conflicts with hwloc
PR: 252523
Submitted by: jwb
Approved by: rozhuk.im at gmail.com
Modified:
head/math/mprime/Makefile
head/math/mprime/files/patch-commonc.c
head/math/mprime/files/patch-gwnum_makemsys
head/math/mprime/files/patch-linux_makebsd
Modified: head/math/mprime/Makefile
==============================================================================
--- head/math/mprime/Makefile Mon Jan 11 20:24:30 2021 (r561261)
+++ head/math/mprime/Makefile Mon Jan 11 20:26:11 2021 (r561262)
@@ -3,7 +3,7 @@
PORTNAME= mprime
PORTVERSION= 29.8b3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math benchmarks net
MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \
ftp://mersenne.org/gimps/
@@ -20,7 +20,7 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
ONLY_FOR_ARCHS= amd64 i386
LIB_DEPENDS= libcurl.so:ftp/curl \
- libhwloc.so:devel/hwloc \
+ libhwloc.so.15:devel/hwloc2 \
libgmp.so:math/gmp
USES= zip
Modified: head/math/mprime/files/patch-commonc.c
==============================================================================
--- head/math/mprime/files/patch-commonc.c Mon Jan 11 20:24:30 2021 (r561261)
+++ head/math/mprime/files/patch-commonc.c Mon Jan 11 20:26:11 2021 (r561262)
@@ -1,6 +1,6 @@
---- 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 @@
+--- commonc.c.orig 2019-04-11 22:46:50 UTC
++++ commonc.c
+@@ -386,6 +386,8 @@ void getCpuInfo (void)
CPU_L2_CACHE_INCLUSIVE = -1;
CPU_L3_CACHE_INCLUSIVE = -1;
CPU_L4_CACHE_INCLUSIVE = -1;
@@ -9,7 +9,7 @@
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 @@
+@@ -423,6 +425,7 @@ void getCpuInfo (void)
}
}
}
Modified: head/math/mprime/files/patch-gwnum_makemsys
==============================================================================
--- head/math/mprime/files/patch-gwnum_makemsys Mon Jan 11 20:24:30 2021 (r561261)
+++ head/math/mprime/files/patch-gwnum_makemsys Mon Jan 11 20:26:11 2021 (r561262)
@@ -1,5 +1,5 @@
---- gwnum/makemsys.orig 2019-04-22 22:05:20.000000000 +0300
-+++ gwnum/makemsys 2019-05-14 23:48:06.059075000 +0300
+--- gwnum/makemsys.orig 2019-04-23 03:05:20 UTC
++++ gwnum/makemsys
@@ -1,13 +1,13 @@
# Makefile for Mingw/msys gwnum library
#
@@ -19,7 +19,7 @@
LINUXOBJS = cpuid.o gwnum.o gwtables.o gwthread.o gwini.o gwbench.o gwutil.o gwdbldbl.o giants.o ecmstag1.o
-@@ -29,4 +29,4 @@
+@@ -29,4 +29,4 @@ distclean: clean
$(CC) $(CFLAGS) -c $<
.cpp.o:
Modified: head/math/mprime/files/patch-linux_makebsd
==============================================================================
--- head/math/mprime/files/patch-linux_makebsd Mon Jan 11 20:24:30 2021 (r561261)
+++ head/math/mprime/files/patch-linux_makebsd Mon Jan 11 20:26:11 2021 (r561262)
@@ -1,5 +1,5 @@
---- linux/makebsd.bak 2019-04-22 22:05:22.000000000 +0300
-+++ linux/makebsd 2019-05-14 23:41:22.010249000 +0300
+--- linux/makebsd.orig 2019-04-23 03:05:22 UTC
++++ linux/makebsd
@@ -7,13 +7,13 @@
#
More information about the svn-ports-head
mailing list