[Midnightbsd-cvs] mports [23332] trunk/devel/hwloc: update hwloc to 1.11.7

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed May 2 23:57:09 EDT 2018 

Revision: 23332
          http://svnweb.midnightbsd.org/mports/?rev=23332
Author:   laffer1
Date:     2018-05-02 23:57:08 -0400 (Wed, 02 May 2018)
Log Message:
-----------
update hwloc to 1.11.7

Modified Paths:
--------------
    trunk/devel/hwloc/Makefile
    trunk/devel/hwloc/distinfo
    trunk/devel/hwloc/pkg-plist

Added Paths:
-----------
    trunk/devel/hwloc/files/patch-src_topology-x86.c

Removed Paths:
-------------
    trunk/devel/hwloc/files/patch-utils+Makefile.in

Modified: trunk/devel/hwloc/Makefile
===================================================================
--- trunk/devel/hwloc/Makefile	2018-05-03 03:51:33 UTC (rev 23331)
+++ trunk/devel/hwloc/Makefile	2018-05-03 03:57:08 UTC (rev 23332)
@@ -2,11 +2,11 @@
 # $FreeBSD: head/devel/hwloc/Makefile 343246 2014-02-07 14:03:38Z decke $
 
 PORTNAME=	hwloc
-PORTVERSION=	1.9
+PORTVERSION=	1.11.7
 PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION}/downloads/ \
-		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION}/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION:R}/downloads/ \
+		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION:R}/downloads/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Portable Hardware Locality software package
@@ -14,13 +14,16 @@
 LICENSE=	bsd3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-static \
-			--enable-libxml2 \
-			--disable-gl
-USES=		pkgconfig pathfix iconv libtool tar:bzip2
+CONFIGURE_ARGS=	--enable-static \
+		--disable-opencl \
+		--disable-cuda \
+		--disable-nvml \
+		--disable-gl
+INSTALL_TARGET=	install-strip
+USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
@@ -27,11 +30,12 @@
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	CAIRO DOCS
+OPTIONS_SUB=	yes
 
 CAIRO_CONFIGURE_OFF=	--disable-cairo --without-x
 CAIRO_CONFIGURE_ON=	--enable-cairo --with-x
-CAIRO_LIB_DEPENDS=		libcairo.so:${PORTSDIR}/graphics/cairo
-CAIRO_USE=	XORG=x11
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
+CAIRO_USE=		XORG=x11
 
 post-install:
 	@${MKDIR} ${DOCSDIR}/html

Modified: trunk/devel/hwloc/distinfo
===================================================================
--- trunk/devel/hwloc/distinfo	2018-05-03 03:51:33 UTC (rev 23331)
+++ trunk/devel/hwloc/distinfo	2018-05-03 03:57:08 UTC (rev 23332)
@@ -1,2 +1,3 @@
-SHA256 (hwloc-1.9.tar.bz2) = 24a81ff1c3810f16633bf5ad3fb80cbbaf882e466a788af4301b2911698c4f7e
-SIZE (hwloc-1.9.tar.bz2) = 3682256
+TIMESTAMP = 1493303875
+SHA256 (hwloc-1.11.7.tar.bz2) = ab6910e248eed8c85d08b529917a6aae706b32b346e886ba830895e36a809729
+SIZE (hwloc-1.11.7.tar.bz2) = 4187754

Added: trunk/devel/hwloc/files/patch-src_topology-x86.c
===================================================================
--- trunk/devel/hwloc/files/patch-src_topology-x86.c	                        (rev 0)
+++ trunk/devel/hwloc/files/patch-src_topology-x86.c	2018-05-03 03:57:08 UTC (rev 23332)
@@ -0,0 +1,17 @@
+--- src/topology-x86.c.orig	2017-04-19 15:19:38 UTC
++++ src/topology-x86.c
+@@ -997,7 +997,14 @@ int hwloc_look_x86(struct hwloc_backend *backend, int 
+   unsigned features[10] = { 0 };
+   struct procinfo *infos = NULL;
+   enum cpuid_type cpuid_type = unknown;
++#if defined HWLOC_FREEBSD_SYS && defined HAVE_CPUSET_SETID \
++ && __FreeBSD_version >= 1101000 && __FreeBSD_version < 1102000
++  /* Buffer overrun in cpuset_getid in FreeBSD 11.1 */
++  hwloc_x86_os_state_t os_state[2];
++#define os_state os_state[0]
++#else
+   hwloc_x86_os_state_t os_state;
++#endif
+   struct hwloc_binding_hooks hooks;
+   struct hwloc_topology_support support;
+   struct hwloc_topology_membind_support memsupport __hwloc_attribute_unused;


Property changes on: trunk/devel/hwloc/files/patch-src_topology-x86.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/devel/hwloc/files/patch-utils+Makefile.in
===================================================================
--- trunk/devel/hwloc/files/patch-utils+Makefile.in	2018-05-03 03:51:33 UTC (rev 23331)
+++ trunk/devel/hwloc/files/patch-utils+Makefile.in	2018-05-03 03:57:08 UTC (rev 23332)
@@ -1,12 +0,0 @@
---- utils/Makefile.in.orig	2013-04-03 22:42:37.000000000 +0900
-+++ utils/Makefile.in	2013-04-03 22:43:41.000000000 +0900
-@@ -1816,9 +1816,7 @@
- @HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	rm -f $(DESTDIR)$(bindir)/lstopo
- @HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@	cd $(DESTDIR)$(bindir) && $(LN_S) lstopo-no-graphics$(EXEEXT) lstopo$(EXEEXT) || true
- 	rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1
--	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1
- 	rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
--	cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1
- 	$(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
- 	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote
- 

Modified: trunk/devel/hwloc/pkg-plist
===================================================================
--- trunk/devel/hwloc/pkg-plist	2018-05-03 03:51:33 UTC (rev 23331)
+++ trunk/devel/hwloc/pkg-plist	2018-05-03 03:57:08 UTC (rev 23332)
@@ -33,7 +33,7 @@
 lib/libhwloc.a
 lib/libhwloc.so
 lib/libhwloc.so.5
-lib/libhwloc.so.5.5.0
+lib/libhwloc.so.5.7.4
 libdata/pkgconfig/hwloc.pc
 man/man1/hwloc-annotate.1.gz
 man/man1/hwloc-assembler-remote.1.gz
@@ -45,8 +45,10 @@
 man/man1/hwloc-distances.1.gz
 man/man1/hwloc-distrib.1.gz
 man/man1/hwloc-info.1.gz
+man/man1/hwloc-ls.1.gz
 man/man1/hwloc-patch.1.gz
 man/man1/hwloc-ps.1.gz
+man/man1/lstopo-no-graphics.1.gz
 man/man1/lstopo.1.gz
 man/man3/HWLOC_API_VERSION.3.gz
 man/man3/HWLOC_CPUBIND_NOMEMBIND.3.gz
@@ -53,9 +55,10 @@
 man/man3/HWLOC_CPUBIND_PROCESS.3.gz
 man/man3/HWLOC_CPUBIND_STRICT.3.gz
 man/man3/HWLOC_CPUBIND_THREAD.3.gz
+man/man3/HWLOC_DISTRIB_FLAG_REVERSE.3.gz
 man/man3/HWLOC_MEMBIND_BIND.3.gz
+man/man3/HWLOC_MEMBIND_BYNODESET.3.gz
 man/man3/HWLOC_MEMBIND_DEFAULT.3.gz
-man/man3/HWLOC_DISTRIB_FLAG_REVERSE.3.gz
 man/man3/HWLOC_MEMBIND_FIRSTTOUCH.3.gz
 man/man3/HWLOC_MEMBIND_INTERLEAVE.3.gz
 man/man3/HWLOC_MEMBIND_MIGRATE.3.gz
@@ -77,7 +80,7 @@
 man/man3/HWLOC_OBJ_GROUP.3.gz
 man/man3/HWLOC_OBJ_MACHINE.3.gz
 man/man3/HWLOC_OBJ_MISC.3.gz
-man/man3/HWLOC_OBJ_NODE.3.gz
+man/man3/HWLOC_OBJ_NUMANODE.3.gz
 man/man3/HWLOC_OBJ_OSDEV_BLOCK.3.gz
 man/man3/HWLOC_OBJ_OSDEV_COPROC.3.gz
 man/man3/HWLOC_OBJ_OSDEV_DMA.3.gz
@@ -85,11 +88,10 @@
 man/man3/HWLOC_OBJ_OSDEV_NETWORK.3.gz
 man/man3/HWLOC_OBJ_OSDEV_OPENFABRICS.3.gz
 man/man3/HWLOC_OBJ_OS_DEVICE.3.gz
+man/man3/HWLOC_OBJ_PACKAGE.3.gz
 man/man3/HWLOC_OBJ_PCI_DEVICE.3.gz
 man/man3/HWLOC_OBJ_PU.3.gz
-man/man3/HWLOC_OBJ_SOCKET.3.gz
 man/man3/HWLOC_OBJ_SYSTEM.3.gz
-man/man3/HWLOC_OBJ_TYPE_MAX.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3.gz
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3.gz
@@ -205,6 +207,7 @@
 man/man3/hwloc_get_api_version.3.gz
 man/man3/hwloc_get_area_membind.3.gz
 man/man3/hwloc_get_area_membind_nodeset.3.gz
+man/man3/hwloc_get_area_memlocation.3.gz
 man/man3/hwloc_get_cache_covering_cpuset.3.gz
 man/man3/hwloc_get_cache_type_depth.3.gz
 man/man3/hwloc_get_child_covering_cpuset.3.gz
@@ -339,6 +342,7 @@
 man/man3/hwloc_topology_diff_u.3.gz
 man/man3/hwloc_topology_discovery_support.3.gz
 man/man3/hwloc_topology_dup.3.gz
+man/man3/hwloc_topology_export_synthetic.3.gz
 man/man3/hwloc_topology_export_xml.3.gz
 man/man3/hwloc_topology_export_xmlbuffer.3.gz
 man/man3/hwloc_topology_flags_e.3.gz
@@ -349,9 +353,9 @@
 man/man3/hwloc_topology_get_depth.3.gz
 man/man3/hwloc_topology_get_flags.3.gz
 man/man3/hwloc_topology_get_online_cpuset.3.gz
-man/man3/hwloc_topology_get_support.3.gz
 man/man3/hwloc_topology_get_topology_cpuset.3.gz
 man/man3/hwloc_topology_get_topology_nodeset.3.gz
+man/man3/hwloc_topology_get_userdata.3.gz
 man/man3/hwloc_topology_ignore_all_keep_structure.3.gz
 man/man3/hwloc_topology_ignore_type.3.gz
 man/man3/hwloc_topology_ignore_type_keep_structure.3.gz
@@ -368,6 +372,7 @@
 man/man3/hwloc_topology_set_fsroot.3.gz
 man/man3/hwloc_topology_set_pid.3.gz
 man/man3/hwloc_topology_set_synthetic.3.gz
+man/man3/hwloc_topology_set_userdata.3.gz
 man/man3/hwloc_topology_set_userdata_export_callback.3.gz
 man/man3/hwloc_topology_set_userdata_import_callback.3.gz
 man/man3/hwloc_topology_set_xml.3.gz
@@ -409,8 +414,10 @@
 man/man3/hwlocality_objects.3.gz
 man/man3/hwlocality_opencl.3.gz
 man/man3/hwlocality_openfabrics.3.gz
+man/man3/hwlocality_syntheticexport.3.gz
 man/man3/hwlocality_tinker.3.gz
 man/man3/hwlocality_xmlexport.3.gz
 man/man7/hwloc.7.gz
+%%CAIRO%%share/applications/lstopo.desktop
 share/hwloc/hwloc-valgrind.supp
 share/hwloc/hwloc.dtd

More information about the Midnightbsd-cvs mailing list