From owner-svn-ports-head@freebsd.org Mon Jan 11 20:26:12 2021 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 A114E4E50A8; Mon, 11 Jan 2021 20:26:12 +0000 (UTC) (envelope-from jwb@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 4DF4wh3jDMz4pSp; Mon, 11 Jan 2021 20:26:12 +0000 (UTC) (envelope-from jwb@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 6D9ED20D47; Mon, 11 Jan 2021 20:26:12 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10BKQCN7065970; Mon, 11 Jan 2021 20:26:12 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10BKQBre065966; Mon, 11 Jan 2021 20:26:11 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <202101112026.10BKQBre065966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Mon, 11 Jan 2021 20:26:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561262 - in head/math/mprime: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/math/mprime: . files X-SVN-Commit-Revision: 561262 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.34 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: Mon, 11 Jan 2021 20:26:12 -0000 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@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 @@ #