Attachment #134237 for bug #178882

View | Details | Raw Unified | Return to bug 178882
Collapse All | Expand All

Lines 1-10 Link Here

(-)./Makefile (-6 / +9 lines)
1	# $FreeBSD: devel/hwloc/Makefile 316654 2013-04-27 08:50:46Z mva $	1	# $FreeBSD: devel/hwloc/Makefile 316654 2013-04-27 08:50:46Z mva $
2		2
3	PORTNAME= hwloc	3	PORTNAME= hwloc
4	PORTVERSION= 1.6.2	4	PORTVERSION= 1.7.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= http://www.open-mpi.org/software/hwloc/v1.6/downloads/ \	6	MASTER_SITES= http://www.open-mpi.org/software/hwloc/v1.7/downloads/ \
7	http://icl.cs.utk.edu/open-mpi/software/hwloc/v1.6/downloads/	7	http://icl.cs.utk.edu/open-mpi/software/hwloc/v1.7/downloads/
8		8
9	MAINTAINER= phd_kimberlite@yahoo.co.jp	9	MAINTAINER= phd_kimberlite@yahoo.co.jp
10	COMMENT= The Portable Hardware Locality software package	10	COMMENT= The Portable Hardware Locality software package
Lines 16-26 Link Here
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS+= --enable-static \	18	CONFIGURE_ARGS+= --enable-static \
19	--enable-libxml2	19	--enable-libxml2 \
20	USES= pkgconfig pathfix iconv	20	--disable-gl
21	USE_BZIP2= yes	21	USE_BZIP2= yes
		22	USE_PKGCONFIG= build
		23	USE_ICONV= yes
22	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
23	USE_GNOME= libxml2	25	USE_GNOME= libxml2 gnomehack
24	MAKE_JOBS_SAFE= yes	26	MAKE_JOBS_SAFE= yes
25		27
26	PORTDOCS= *	28	PORTDOCS= *
Lines 29-34 Link Here
29	ONLY_FOR_ARCHS_REASON= has not been ported to this architecture	31	ONLY_FOR_ARCHS_REASON= has not been ported to this architecture
30		32
31	OPTIONS_DEFINE= CAIRO	33	OPTIONS_DEFINE= CAIRO
		34	OPTIONS_DEFAULT=
32		35
33	.include "${.CURDIR}/Makefile.man"	36	.include "${.CURDIR}/Makefile.man"
34	.include <bsd.port.options.mk>	37	.include <bsd.port.options.mk>

Lines 40-45 Link Here

(-)./Makefile.man (+21 lines)
40	HWLOC_OBJ_MISC.3 \	40	HWLOC_OBJ_MISC.3 \
41	HWLOC_OBJ_NODE.3 \	41	HWLOC_OBJ_NODE.3 \
42	HWLOC_OBJ_OSDEV_BLOCK.3 \	42	HWLOC_OBJ_OSDEV_BLOCK.3 \
		43	HWLOC_OBJ_OSDEV_COPROC.3 \
43	HWLOC_OBJ_OSDEV_DMA.3 \	44	HWLOC_OBJ_OSDEV_DMA.3 \
44	HWLOC_OBJ_OSDEV_GPU.3 \	45	HWLOC_OBJ_OSDEV_GPU.3 \
45	HWLOC_OBJ_OSDEV_NETWORK.3 \	46	HWLOC_OBJ_OSDEV_NETWORK.3 \
Lines 137-145 Link Here
137	hwloc_cpuset_to_nodeset.3 \	138	hwloc_cpuset_to_nodeset.3 \
138	hwloc_cpuset_to_nodeset_strict.3 \	139	hwloc_cpuset_to_nodeset_strict.3 \
139	hwloc_cuda_get_device_cpuset.3 \	140	hwloc_cuda_get_device_cpuset.3 \
		141	hwloc_cuda_get_device_osdev.3 \
		142	hwloc_cuda_get_device_osdev_by_index.3 \
140	hwloc_cuda_get_device_pci_ids.3 \	143	hwloc_cuda_get_device_pci_ids.3 \
141	hwloc_cuda_get_device_pcidev.3 \	144	hwloc_cuda_get_device_pcidev.3 \
142	hwloc_cudart_get_device_cpuset.3 \	145	hwloc_cudart_get_device_cpuset.3 \
		146	hwloc_cudart_get_device_osdev_by_index.3 \
143	hwloc_cudart_get_device_pci_ids.3 \	147	hwloc_cudart_get_device_pci_ids.3 \
144	hwloc_cudart_get_device_pcidev.3 \	148	hwloc_cudart_get_device_pcidev.3 \
145	hwloc_custom_insert_group_object_by_parent.3 \	149	hwloc_custom_insert_group_object_by_parent.3 \
Lines 210-217 Link Here
210	hwloc_get_type_or_below_depth.3 \	214	hwloc_get_type_or_below_depth.3 \
211	hwloc_get_whole_distance_matrix_by_depth.3 \	215	hwloc_get_whole_distance_matrix_by_depth.3 \
212	hwloc_get_whole_distance_matrix_by_type.3 \	216	hwloc_get_whole_distance_matrix_by_type.3 \
		217	hwloc_gl_get_display_by_osdev.3 \
		218	hwloc_gl_get_display_osdev_by_name.3 \
		219	hwloc_gl_get_display_osdev_by_port_device.3 \
213	hwloc_ibv_get_device_cpuset.3 \	220	hwloc_ibv_get_device_cpuset.3 \
		221	hwloc_ibv_get_device_osdev.3 \
214	hwloc_ibv_get_device_osdev_by_name.3 \	222	hwloc_ibv_get_device_osdev_by_name.3 \
		223	hwloc_intel_mic_get_device_cpuset.3 \
		224	hwloc_intel_mic_get_device_osdev_by_index.3 \
215	hwloc_linux_get_tid_cpubind.3 \	225	hwloc_linux_get_tid_cpubind.3 \
216	hwloc_linux_parse_cpumap_file.3 \	226	hwloc_linux_parse_cpumap_file.3 \
217	hwloc_linux_set_tid_cpubind.3 \	227	hwloc_linux_set_tid_cpubind.3 \
Lines 224-229 Link Here
224	hwloc_nodeset_t.3 \	234	hwloc_nodeset_t.3 \
225	hwloc_nodeset_to_linux_libnuma_bitmask.3 \	235	hwloc_nodeset_to_linux_libnuma_bitmask.3 \
226	hwloc_nodeset_to_linux_libnuma_ulongs.3 \	236	hwloc_nodeset_to_linux_libnuma_ulongs.3 \
		237	hwloc_nvml_get_device_cpuset.3 \
		238	hwloc_nvml_get_device_osdev.3 \
		239	hwloc_nvml_get_device_osdev_by_index.3 \
227	hwloc_obj.3 \	240	hwloc_obj.3 \
228	hwloc_obj_add_info.3 \	241	hwloc_obj_add_info.3 \
229	hwloc_obj_attr_snprintf.3 \	242	hwloc_obj_attr_snprintf.3 \
Lines 251-256 Link Here
251	hwloc_obj_type_snprintf.3 \	264	hwloc_obj_type_snprintf.3 \
252	hwloc_obj_type_string.3 \	265	hwloc_obj_type_string.3 \
253	hwloc_obj_type_t.3 \	266	hwloc_obj_type_t.3 \
		267	hwloc_opencl_get_device_cpuset.3 \
		268	hwloc_opencl_get_device_osdev.3 \
		269	hwloc_opencl_get_device_osdev_by_index.3 \
254	hwloc_restrict_flags_e.3 \	270	hwloc_restrict_flags_e.3 \
255	hwloc_set_area_membind.3 \	271	hwloc_set_area_membind.3 \
256	hwloc_set_area_membind_nodeset.3 \	272	hwloc_set_area_membind_nodeset.3 \
Lines 273-278 Link Here
273	hwloc_topology_get_complete_cpuset.3 \	289	hwloc_topology_get_complete_cpuset.3 \
274	hwloc_topology_get_complete_nodeset.3 \	290	hwloc_topology_get_complete_nodeset.3 \
275	hwloc_topology_get_depth.3 \	291	hwloc_topology_get_depth.3 \
		292	hwloc_topology_get_flags.3 \
276	hwloc_topology_get_online_cpuset.3 \	293	hwloc_topology_get_online_cpuset.3 \
277	hwloc_topology_get_support.3 \	294	hwloc_topology_get_support.3 \
278	hwloc_topology_get_topology_cpuset.3 \	295	hwloc_topology_get_topology_cpuset.3 \
Lines 310-315 Link Here
310	hwlocality_cudart.3 \	327	hwlocality_cudart.3 \
311	hwlocality_custom.3 \	328	hwlocality_custom.3 \
312	hwlocality_distances.3 \	329	hwlocality_distances.3 \
		330	hwlocality_gl.3 \
313	hwlocality_glibc_sched.3 \	331	hwlocality_glibc_sched.3 \
314	hwlocality_helper_binding.3 \	332	hwlocality_helper_binding.3 \
315	hwlocality_helper_cpuset.3 \	333	hwlocality_helper_cpuset.3 \
Lines 323-334 Link Here
323	hwlocality_helper_traversal_basic.3 \	341	hwlocality_helper_traversal_basic.3 \
324	hwlocality_helper_types.3 \	342	hwlocality_helper_types.3 \
325	hwlocality_information.3 \	343	hwlocality_information.3 \
		344	hwlocality_intel_mic.3 \
326	hwlocality_linux.3 \	345	hwlocality_linux.3 \
327	hwlocality_linux_libnuma_bitmask.3 \	346	hwlocality_linux_libnuma_bitmask.3 \
328	hwlocality_linux_libnuma_ulongs.3 \	347	hwlocality_linux_libnuma_ulongs.3 \
329	hwlocality_membinding.3 \	348	hwlocality_membinding.3 \
330	hwlocality_myriexpress.3 \	349	hwlocality_myriexpress.3 \
		350	hwlocality_nvml.3 \
331	hwlocality_objects.3 \	351	hwlocality_objects.3 \
		352	hwlocality_opencl.3 \
332	hwlocality_openfabrics.3 \	353	hwlocality_openfabrics.3 \
333	hwlocality_sets.3 \	354	hwlocality_sets.3 \
334	hwlocality_tinker.3 \	355	hwlocality_tinker.3 \

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (hwloc-1.6.2.tar.bz2) = fd4d47738afc9c5f60d2c35f0963f82feb78bb57f2bc239e84e93ad376169df1	1	SHA256 (hwloc-1.7.1.tar.bz2) = 96a3c34f7237205448a99d1a16daac6c052f81abc2e2ddfbacc154a31a8c0d01
2	SIZE (hwloc-1.6.2.tar.bz2) = 3066020	2	SIZE (hwloc-1.7.1.tar.bz2) = 3214808




--- 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
 




include/hwloc/bitmap.h
include/hwloc/cuda.h
include/hwloc/cudart.h
include/hwloc/gl.h
include/hwloc/helper.h
include/hwloc/intel-mic.h
include/hwloc/myriexpress.h
include/hwloc/nvml.h
include/hwloc/opencl.h
include/hwloc/openfabrics-verbs.h
include/hwloc/plugins.h
include/hwloc/rename.h
lib/libhwloc.a
lib/libhwloc.la
lib/libhwloc.so
lib/libhwloc.so.8
libdata/pkgconfig/hwloc.pc
share/hwloc/hwloc-valgrind.supp
share/hwloc/hwloc.dtd

Return to bug 178882

Lines 1-12 Link Here

(-)./files/patch-utils+Makefile.in (-6 / +6 lines)
1	--- utils/Makefile.in.orig 2012-12-04 00:27:15.000000000 +0900	1	--- utils/Makefile.in.orig 2013-04-03 22:42:37.000000000 +0900
2	+++ utils/Makefile.in 2012-12-04 00:27:30.000000000 +0900	2	+++ utils/Makefile.in 2013-04-03 22:43:41.000000000 +0900
3	@@ -1505,9 +1505,7 @@	3	@@ -1816,9 +1816,7 @@
4	@HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@ rm -f $(DESTDIR)$(bindir)/lstopo	4	@HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@ rm -f $(DESTDIR)$(bindir)/lstopo
5	@HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@ cd $(DESTDIR)$(bindir) && $(LN_S) lstopo-no-graphics$(EXEEXT) lstopo$(EXEEXT) \|\| true	5	@HWLOC_HAVE_CAIRO_FALSE@@HWLOC_HAVE_WINDOWS_FALSE@ cd $(DESTDIR)$(bindir) && $(LN_S) lstopo-no-graphics$(EXEEXT) lstopo$(EXEEXT) \|\| true
6	rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1 $(DESTDIR)$(man1dir)/hwloc-info.1	6	rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1
7	- cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1 && $(LN_S) lstopo.1 hwloc-info.1	7	- cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1
8	rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1	8	rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
9	- cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1	9	- cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1
10	$(SED) -e 's/abs_top_builddir\/utils/bindir/' -e '/abs_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	10	$(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
11	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote	11	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote
12		12

Lines 15-28 Link Here

(-)./pkg-plist (-1 / +6 lines)
15	include/hwloc/bitmap.h	15	include/hwloc/bitmap.h
16	include/hwloc/cuda.h	16	include/hwloc/cuda.h
17	include/hwloc/cudart.h	17	include/hwloc/cudart.h
		18	include/hwloc/gl.h
18	include/hwloc/helper.h	19	include/hwloc/helper.h
		20	include/hwloc/intel-mic.h
19	include/hwloc/myriexpress.h	21	include/hwloc/myriexpress.h
		22	include/hwloc/nvml.h
		23	include/hwloc/opencl.h
20	include/hwloc/openfabrics-verbs.h	24	include/hwloc/openfabrics-verbs.h
		25	include/hwloc/plugins.h
21	include/hwloc/rename.h	26	include/hwloc/rename.h
22	lib/libhwloc.a	27	lib/libhwloc.a
23	lib/libhwloc.la	28	lib/libhwloc.la
24	lib/libhwloc.so	29	lib/libhwloc.so
25	lib/libhwloc.so.7	30	lib/libhwloc.so.8
26	libdata/pkgconfig/hwloc.pc	31	libdata/pkgconfig/hwloc.pc
27	share/hwloc/hwloc-valgrind.supp	32	share/hwloc/hwloc-valgrind.supp
28	share/hwloc/hwloc.dtd	33	share/hwloc/hwloc.dtd