From def99a37ad2b2c864ea3a54973c440e35aa89b59 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 7 Jul 2012 05:18:49 +0100 Subject: [PATCH 1/1] Import hwloc_1.4.1-4.debian.tar.bz2 [dgit import tarball hwloc 1.4.1-4 hwloc_1.4.1-4.debian.tar.bz2] --- changelog | 207 ++++++++++++++++++++++++++++++++ compat | 1 + control | 146 ++++++++++++++++++++++ copyright | 52 ++++++++ hwloc-nox.docs | 2 + hwloc-nox.install | 2 + hwloc-nox.links | 2 + hwloc-nox.manpages | 2 + hwloc.docs | 2 + hwloc.install | 1 + hwloc.manpages | 2 + hwloc.menu | 2 + libhwloc-common.install | 1 + libhwloc-dev.install | 4 + libhwloc-doc.docs | 3 + libhwloc-doc.install | 1 + libhwloc-doc.manpages | 1 + libhwloc5.install | 1 + libhwloc5.links.in | 5 + patches/gfbsd-ftbfs_r4578 | 43 +++++++ patches/series | 2 + patches/unitialized_bytes_r4576 | 14 +++ rules | 116 ++++++++++++++++++ source/format | 1 + source/options | 1 + 25 files changed, 614 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 hwloc-nox.docs create mode 100644 hwloc-nox.install create mode 100644 hwloc-nox.links create mode 100644 hwloc-nox.manpages create mode 100644 hwloc.docs create mode 100644 hwloc.install create mode 100644 hwloc.manpages create mode 100644 hwloc.menu create mode 100644 libhwloc-common.install create mode 100644 libhwloc-dev.install create mode 100644 libhwloc-doc.docs create mode 100644 libhwloc-doc.install create mode 100644 libhwloc-doc.manpages create mode 100644 libhwloc5.install create mode 100644 libhwloc5.links.in create mode 100644 patches/gfbsd-ftbfs_r4578 create mode 100644 patches/series create mode 100644 patches/unitialized_bytes_r4576 create mode 100755 rules create mode 100644 source/format create mode 100644 source/options diff --git a/changelog b/changelog new file mode 100644 index 0000000..de80ca4 --- /dev/null +++ b/changelog @@ -0,0 +1,207 @@ +hwloc (1.4.1-4) unstable; urgency=low + + * patches/gfbsd-ftbfs_r4578: New upstream patch to avoid missing + cpuset_setaffinity function on kfreebsd-any + * patches/unitialized_bytes_r4576: New upstream patch to fix uninitialized + pointers in topology structure. + + -- Samuel Thibault Sat, 07 Jul 2012 01:18:49 -0300 + +hwloc (1.4.1-3) unstable; urgency=low + + [ Julien Cristau ] + * Restore ABI compatibility symlinks and provide/replace/conflict, except + with non-dangling symlinks this time. Closes: #664571. + + -- Samuel Thibault Fri, 06 Jul 2012 22:13:03 -0300 + +hwloc (1.4.1-2) unstable; urgency=low + + * Remove ABI compatibility symlinks and provide/replace/conflict, ldconfig + actually removes them so they do not actually work. + + -- Samuel Thibault Wed, 28 Mar 2012 01:43:52 +0200 + +hwloc (1.4.1-1) unstable; urgency=low + + * New upstream release. + * control: Bump Standards-Version to 3.9.3 (no changes). + + -- Samuel Thibault Sat, 25 Feb 2012 17:41:58 +0100 + +hwloc (1.4-1) unstable; urgency=low + + * New upstream release, rename libhwloc4 package into libhwloc5 due to + soname change. + * Add ABI compatibility symlinks, and make libhwloc5 provide, replace and + conflict with previous versions. + + -- Samuel Thibault Thu, 26 Jan 2012 17:00:20 +0100 + +hwloc (1.3.1-1) unstable; urgency=low + + * New upstream release. + * Add hwloc-dev dependency on libpci-dev. + + -- Samuel Thibault Tue, 20 Dec 2011 13:46:54 +0100 + +hwloc (1.3-1) unstable; urgency=low + + * New upstream release, rename libhwloc3 package into libhwloc4 due to + soname change. + * debian/control: Build-Depend on libpci-dev. + + -- Samuel Thibault Sat, 12 Nov 2011 23:08:06 +0100 + +hwloc (1.2.2-1) unstable; urgency=low + + * New upstream release. + * control: Depend on hardening-check. + * rules: Set DEB_BUILD_HARDENING=1 to enable hardening. + + -- Samuel Thibault Wed, 14 Sep 2011 17:18:20 +0200 + +hwloc (1.2.1-1) unstable; urgency=low + + * New upstream release. + * debian/libhwloc-dev.install: Move pkg-config file to multiarch place. + + -- Samuel Thibault Thu, 09 Jun 2011 13:12:59 +0200 + +hwloc (1.2-3) unstable; urgency=low + + * debian/rules: Set libdir to DEB_HOST_MULTIARCH. + * debian/control: Make libhwloc3 pre-depend on multiarch-support. + + -- Samuel Thibault Sun, 05 Jun 2011 12:38:54 +0200 + +hwloc (1.2-2) unstable; urgency=low + + * debian/rules: Use DEB_HOST_GNU_TYPE for /usr/lib path until shlibdeps + finds libraries in DEB_HOST_MULTIARCH on any-i386. + + -- Samuel Thibault Sun, 08 May 2011 10:24:47 +0200 + +hwloc (1.2-1) unstable; urgency=low + + * New upstream release, rename libhwloc2 package into libhwloc3 due to + soname change. + * debian/control: + - Build-depend on dpkg-dev (>= 1.16) + - Bump Standards-Version to 3.9.2 + * debian/rules: Use DEB_HOST_MULTIARCH for /usr/lib path. + + -- Samuel Thibault Sun, 10 Apr 2011 20:13:45 +0200 + +hwloc (1.1.2-1) unstable; urgency=low + + * New upstream release. + * debian/control: Replace doxygen+texlive* build dependency with + doxygen-latex (Closes: Bug#616253). + + -- Samuel Thibault Thu, 03 Mar 2011 15:06:51 +0100 + +hwloc (1.1.1-1) unstable; urgency=low + + * New upstream release, rename libhwloc1 package into libhwloc2 due to + soname change. + + -- Samuel Thibault Sun, 06 Feb 2011 04:28:37 +0100 + +hwloc (1.1-2) experimental; urgency=low + + * Rename libhwloc0 packages name into libhwloc1 due to soname change. + + -- Samuel Thibault Mon, 03 Jan 2011 11:12:18 +0100 + +hwloc (1.1-1) experimental; urgency=low + + * New upstream release. + - debian/patches/no-ibverbs-dep: Drop, merged upstream. + - debian/copyright: Update. + + -- Samuel Thibault Fri, 17 Dec 2010 01:51:24 +0100 + +hwloc (1.0.2-2) unstable; urgency=low + + * debian/control: + - Bump Standards-Version to 3.9.1 (no change needed). + - Build-Depend on autoconf (>= 2.63), Build-conflicts with autoconf2.13 + * debian/rules: + - Run autoconf before build to permit autoconf patches. + - Remove configure on clean. + - Fix typo for parallel build. + * debian/patches/no-ibverbs-dep: New upstream patch to avoid libibverbs + dependency. + + -- Samuel Thibault Tue, 27 Jul 2010 11:43:35 +0200 + +hwloc (1.0.2-1) unstable; urgency=low + + New upstream release. + * debian/hwloc-nox.manpages, debian/hwloc.manpages: Install hwloc.7 too. + * debian/libhwloc-doc.manpages: No need to install linux_* any more. + * debian/control: + - Bump Standards-Version to 3.9.0 (no change needed). + - Replace [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] with [linux-any]. + + -- Samuel Thibault Wed, 21 Jul 2010 22:09:08 +0200 + +hwloc (1.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: Build-Depend on cdbs. + * debian/rules: Include /usr/share/cdbs/1/class/langcore.mk instead of + parsing DEB_BUILD_OPTIONS by hand, enable parallel build. + + -- Samuel Thibault Tue, 18 May 2010 18:23:34 +0200 + +hwloc (1.0~rc1-1) experimental; urgency=low + + * New upstream release canditate. + * debian/format/options: Switch to bz2 compression. + * debian/control: + - Fix libhwloc-common short description. + - Remove duplicate Section field. + - Bump Standards-Version to 3.8.4 (no change needed). + - Add libibverbs-dev Build-Depends on Linux ports. + * debian/rules: Pass --enable-static to configure. + * debian/hwloc-nox.install: Use a wildcard instead of the list of hwloc-* + tools. + + -- Samuel Thibault Tue, 20 Apr 2010 14:53:48 +0200 + +hwloc (0.9.3~rc1-1) unstable; urgency=low + + * New upstream bugfix release. + * patches/binutils-gold.patch: Merged upstream. + * patches/hwloc-hello.patch: Merged upstream. + * control: Add Build-Depends-Indep: doxygen, texlive-latex-base, transfig to + regenerate the documentation. + + -- Samuel Thibault Tue, 24 Nov 2009 20:42:08 +0100 + +hwloc (0.9.2-2) unstable; urgency=low + + * control: + - Enable libnuma-dev build-dep only on archs which have it. + - Add libncurses5-dev build-dep. + - Add expanded "Hardware Locality" in the description. + * rules: Run the testsuite but don't fail for now. + * source/format: Switch to 3.0 format (quilt). + * patches/binutils-gold.patch: Backported upstream patch to fix link + with binutils-gold. + * patches/hwloc-hello.patch: Backported upstream patch to always try + to run hwloc-hello. + * docs: Remove. + * libhwloc-doc.install: Move documentation to /usr/share/doc/libhwloc-doc. + * libhwloc-doc.docs: Add NEWS, README and html documentation. + * hwloc.docs, hwloc-nox.docs: Add NEWS and README files. + + -- Samuel Thibault Thu, 19 Nov 2009 03:35:18 +0100 + +hwloc (0.9.2-1) unstable; urgency=low + + * Initial release (Closes: Bug#535615) + + -- Samuel Thibault Tue, 18 Aug 2009 01:35:03 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +7 diff --git a/control b/control new file mode 100644 index 0000000..5d3434c --- /dev/null +++ b/control @@ -0,0 +1,146 @@ +Source: hwloc +Priority: extra +Maintainer: Samuel Thibault +Build-Depends: debhelper (>= 7), autotools-dev, help2man, cdbs, + libcairo2-dev, libx11-dev, libxml2-dev, libxml2-utils, libncurses5-dev, + libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], + libpci-dev, + libibverbs-dev [linux-any], + autoconf (>= 2.63), + dpkg-dev (>= 1.16), + hardening-wrapper +Build-Depends-Indep: doxygen-latex, transfig +Build-Conflicts: autoconf2.13 +Standards-Version: 3.9.3 +Section: libs +Homepage: http://www.open-mpi.org/projects/hwloc/ +Vcs-Svn: http://svn.open-mpi.org/svn/hwloc/debian +Vcs-Browser: http://svn.open-mpi.org/svn/hwloc/debian + +Package: hwloc +Section: admin +Architecture: any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Hierarchical view of the machine - utilities + Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern architectures. It + primarily aims at helping high-performance computing applications with + gathering information about the hardware so as to exploit it accordingly and + efficiently. + . + hwloc provides a hierarchical view of the machine, NUMA memory nodes, + sockets, shared caches, cores and simultaneous multithreading. It also gathers + various attributes such as cache and memory information. + . + hwloc supports old kernels not having sysfs topology information, + with knowledge of cpusets, offline cpus, and Kerrighed support + . + This package contains utilities to show the topology of the machine, manipulate + cpu masks, and bind processes. + +Package: hwloc-nox +Section: admin +Architecture: any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: hwloc +Description: Hierarchical view of the machine - non-X version of utilities + Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern architectures. It + primarily aims at helping high-performance computing applications with + gathering information about the hardware so as to exploit it accordingly and + efficiently. + . + hwloc provides a hierarchical view of the machine, NUMA memory nodes, + sockets, shared caches, cores and simultaneous multithreading. It also gathers + various attributes such as cache and memory information. + . + hwloc supports old kernels not having sysfs topology information, + with knowledge of cpusets, offline cpus, and Kerrighed support + . + This package contains utilities to show the topology of the machine (without X + support), manipulate cpu masks, and bind processes. + +Package: libhwloc-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libhwloc5 (= ${binary:Version}), libxml2-dev, libpci-dev +Description: Hierarchical view of the machine - static libs and headers + Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern architectures. It + primarily aims at helping high-performance computing applications with + gathering information about the hardware so as to exploit it accordingly and + efficiently. + . + libhwloc provides a hierarchical view of the machine, NUMA memory nodes, + sockets, shared caches, cores and simultaneous multithreading. It also gathers + various attributes such as cache and memory information. + . + libhwloc supports old kernels not having sysfs topology information, + with knowledge of cpusets, offline cpus, and Kerrighed support + . + This package contains static libraries and development headers. + +Package: libhwloc5 +Architecture: any +Multi-Arch: same +Pre-Depends: multiarch-support +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4 +Replaces: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4 +Conflicts: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4 +Description: Hierarchical view of the machine - shared libs + libhwloc provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern architectures. It + primarily aims at helping high-performance computing applications with + gathering information about the hardware so as to exploit it accordingly and + efficiently. + . + libhwloc provides a hierarchical view of the machine, NUMA memory nodes, + sockets, shared caches, cores and simultaneous multithreading. It also gathers + various attributes such as cache and memory information. + . + libhwloc supports old kernels not having sysfs topology information, + with knowledge of cpusets, offline cpus, and Kerrighed support + . + This package contains shared libraries. + +Package: libhwloc-common +Architecture: all +Depends: ${misc:Depends} +Description: Hierarchical view of the machine - common files + Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern architectures. It + primarily aims at helping high-performance computing applications with + gathering information about the hardware so as to exploit it accordingly and + efficiently. + . + libhwloc provides a hierarchical view of the machine, NUMA memory nodes, + sockets, shared caches, cores and simultaneous multithreading. It also gathers + various attributes such as cache and memory information. + . + libhwloc supports old kernels not having sysfs topology information, + with knowledge of cpusets, offline cpus, and Kerrighed support + . + This package contains the XML DTD of the lstopo XML output. + +Package: libhwloc-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: Hierarchical view of the machine - documentation + Hardware Locality (hwloc) provides a portable abstraction (across OS, versions, + architectures, ...) of the hierarchical topology of modern architectures. It + primarily aims at helping high-performance computing applications with + gathering information about the hardware so as to exploit it accordingly and + efficiently. + . + libhwloc provides a hierarchical view of the machine, NUMA memory nodes, + sockets, shared caches, cores and simultaneous multithreading. It also gathers + various attributes such as cache and memory information. + . + libhwloc supports old kernels not having sysfs topology information, + with knowledge of cpusets, offline cpus, and Kerrighed support + . + This package contains documentation. diff --git a/copyright b/copyright new file mode 100644 index 0000000..9f882bf --- /dev/null +++ b/copyright @@ -0,0 +1,52 @@ +This package was debianized by Samuel Thibault on +Mon, 06 Jul 2009 10:55:29 +0200. + +It was downloaded from http://www.open-mpi.org/projects/hwloc/ + +Upstream Authors: + + Cédric Augonnet + Jérôme Clet-Ortega + Ludovic Courtès + Brice Goglin + Nathalie Furmento + Samuel Thibault + Jeff Squyres + +Copyright: + + Copyright © 2009 CNRS + Copyright © 2009-2010 INRIA + Copyright © 2009-2010 Université Bordeaux 1 + Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved. + +License: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The Debian packaging is: + + Copyright (C) 2009-2010 Samuel Thibault + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. diff --git a/hwloc-nox.docs b/hwloc-nox.docs new file mode 100644 index 0000000..50bd824 --- /dev/null +++ b/hwloc-nox.docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/hwloc-nox.install b/hwloc-nox.install new file mode 100644 index 0000000..56c5be6 --- /dev/null +++ b/hwloc-nox.install @@ -0,0 +1,2 @@ +obj-nox/utils/.libs/lstopo /usr/bin +obj-nox/utils/.libs/hwloc-* /usr/bin diff --git a/hwloc-nox.links b/hwloc-nox.links new file mode 100644 index 0000000..10d9e27 --- /dev/null +++ b/hwloc-nox.links @@ -0,0 +1,2 @@ +/usr/bin/lstopo /usr/bin/hwloc-info +/usr/bin/lstopo /usr/bin/hwloc-ls diff --git a/hwloc-nox.manpages b/hwloc-nox.manpages new file mode 100644 index 0000000..b09d6a9 --- /dev/null +++ b/hwloc-nox.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/*.1 +debian/tmp/usr/share/man/man7/*.7 diff --git a/hwloc.docs b/hwloc.docs new file mode 100644 index 0000000..50bd824 --- /dev/null +++ b/hwloc.docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/hwloc.install b/hwloc.install new file mode 100644 index 0000000..415f082 --- /dev/null +++ b/hwloc.install @@ -0,0 +1 @@ +/usr/bin diff --git a/hwloc.manpages b/hwloc.manpages new file mode 100644 index 0000000..b09d6a9 --- /dev/null +++ b/hwloc.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/*.1 +debian/tmp/usr/share/man/man7/*.7 diff --git a/hwloc.menu b/hwloc.menu new file mode 100644 index 0000000..e6212ea --- /dev/null +++ b/hwloc.menu @@ -0,0 +1,2 @@ +?package(hwloc):needs="X11" section="Applications/System/Hardware"\ + title="lstopo" command="/usr/bin/lstopo" diff --git a/libhwloc-common.install b/libhwloc-common.install new file mode 100644 index 0000000..f4d081c --- /dev/null +++ b/libhwloc-common.install @@ -0,0 +1 @@ +/usr/share/hwloc diff --git a/libhwloc-dev.install b/libhwloc-dev.install new file mode 100644 index 0000000..abebe49 --- /dev/null +++ b/libhwloc-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/*.pc diff --git a/libhwloc-doc.docs b/libhwloc-doc.docs new file mode 100644 index 0000000..758939f --- /dev/null +++ b/libhwloc-doc.docs @@ -0,0 +1,3 @@ +NEWS +README +doc/doxygen-doc/html diff --git a/libhwloc-doc.install b/libhwloc-doc.install new file mode 100644 index 0000000..c1199d9 --- /dev/null +++ b/libhwloc-doc.install @@ -0,0 +1 @@ +/usr/share/doc/hwloc/* /usr/share/doc/libhwloc-doc/ diff --git a/libhwloc-doc.manpages b/libhwloc-doc.manpages new file mode 100644 index 0000000..242943a --- /dev/null +++ b/libhwloc-doc.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man3/*.3 diff --git a/libhwloc5.install b/libhwloc5.install new file mode 100644 index 0000000..3ddde58 --- /dev/null +++ b/libhwloc5.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/libhwloc5.links.in b/libhwloc5.links.in new file mode 100644 index 0000000..ca75fcb --- /dev/null +++ b/libhwloc5.links.in @@ -0,0 +1,5 @@ +usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.0 +usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.2 +usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.3 +usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.4 diff --git a/patches/gfbsd-ftbfs_r4578 b/patches/gfbsd-ftbfs_r4578 new file mode 100644 index 0000000..33d99ad --- /dev/null +++ b/patches/gfbsd-ftbfs_r4578 @@ -0,0 +1,43 @@ +Index: a/src/topology-freebsd.c +=================================================================== +--- a/src/topology-freebsd.c (révision 4577) ++++ a/src/topology-freebsd.c (révision 4578) +@@ -1,7 +1,7 @@ + /* + * Copyright © 2009 CNRS + * Copyright © 2009-2011 inria. All rights reserved. +- * Copyright © 2009-2010 Université Bordeaux 1 ++ * Copyright © 2009-2010, 2012 Université Bordeaux 1 + * Copyright © 2011 Cisco Systems, Inc. All rights reserved. + * See COPYING in top-level directory. + */ +@@ -27,7 +27,7 @@ + #include + #include + +-#ifdef HAVE_SYS_CPUSET_H ++#if defined(HAVE_SYS_CPUSET_H) && defined(HAVE_CPUSET_SETAFFINITY) + static void + hwloc_freebsd_bsd2hwloc(hwloc_bitmap_t hwloc_cpuset, const cpuset_t *cpuset) + { +@@ -197,7 +197,7 @@ + void + hwloc_set_freebsd_hooks(struct hwloc_topology *topology) + { +-#ifdef HAVE_SYS_CPUSET_H ++#if defined(HAVE_SYS_CPUSET_H) && defined(HAVE_CPUSET_SETAFFINITY) + topology->set_thisproc_cpubind = hwloc_freebsd_set_thisproc_cpubind; + topology->get_thisproc_cpubind = hwloc_freebsd_get_thisproc_cpubind; + topology->set_thisthread_cpubind = hwloc_freebsd_set_thisthread_cpubind; +Index: a/config/hwloc.m4 +=================================================================== +--- a/config/hwloc.m4 (révision 4577) ++++ a/config/hwloc.m4 (révision 4578) +@@ -570,6 +570,7 @@ + ]]) + AC_CHECK_FUNC([sched_setaffinity], [hwloc_have_sched_setaffinity=yes]) + AC_CHECK_HEADERS([sys/cpuset.h],,,[[#include ]]) ++ AC_CHECK_FUNCS([cpuset_setaffinity]) + AC_SEARCH_LIBS([pthread_getthrds_np], [pthread], + AC_DEFINE([HWLOC_HAVE_PTHREAD_GETTHRDS_NP], 1, `Define to 1 if you have pthread_getthrds_np') + ) diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..3b54bf6 --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +unitialized_bytes_r4576 +gfbsd-ftbfs_r4578 diff --git a/patches/unitialized_bytes_r4576 b/patches/unitialized_bytes_r4576 new file mode 100644 index 0000000..7a5ecb3 --- /dev/null +++ b/patches/unitialized_bytes_r4576 @@ -0,0 +1,14 @@ +Index: a/src/topology.c +=================================================================== +--- a/src/topology.c (révision 4575) ++++ a/src/topology.c (révision 4576) +@@ -2504,6 +2504,9 @@ + topology->set_thread_cpubind = NULL; + topology->get_thread_cpubind = NULL; + #endif ++ topology->get_thisproc_last_cpu_location = NULL; ++ topology->get_proc_last_cpu_location = NULL; ++ topology->get_thisthread_last_cpu_location = NULL; + topology->set_thisproc_membind = NULL; + topology->get_thisproc_membind = NULL; + topology->set_thisthread_membind = NULL; diff --git a/rules b/rules new file mode 100755 index 0000000..851471b --- /dev/null +++ b/rules @@ -0,0 +1,116 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/langcore.mk + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +export DEB_BUILD_HARDENING=1 + +ifneq (,$(DEB_PARALLEL_JOBS)) +MAKEFLAGS += -j$(DEB_PARALLEL_JOBS) +endif + +confflags=--prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-static CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + +configure: configure.ac config/hwloc.m4 + autoconf + +obj-x/config.status: configure + dh_testdir + + mkdir -p obj-x + cd obj-x && ../configure $(CROSS) $(confflags) + +obj-nox/config.status: configure + dh_testdir + + mkdir -p obj-nox + cd obj-nox && ../configure $(CROSS) $(confflags) --disable-cairo + + +build: build-stamp-x build-stamp-nox debian/libhwloc5.links +build-stamp-x: obj-x/config.status + dh_testdir + + cd obj-x && $(MAKE) + + touch $@ + +build-stamp-nox: obj-nox/config.status + dh_testdir + + cd obj-nox && $(MAKE) + -cd obj-nox && $(MAKE) check + + touch $@ + +debian/libhwloc5.links: debian/libhwloc5.links.in + sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp-x + rm -f build-stamp-nox + rm -f debian/libhwloc5.links + + rm -fr obj-x obj-nox + rm -f config.sub config.guess + rm -f configure + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + cd obj-x && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +binary-indep: export DH_OPTIONS=-i +binary-indep: install + dh_testdir + dh_testroot + dh_install + dh_installdocs + dh_installchangelogs + dh_installexamples + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: export DH_OPTIONS=-s +binary-arch: install + dh_testdir + dh_testroot + dh_install + dh_installdocs + dh_installchangelogs + dh_installman + dh_installmenu + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/options b/source/options new file mode 100644 index 0000000..8f04d6d --- /dev/null +++ b/source/options @@ -0,0 +1 @@ +compression = "bzip2" -- 2.30.2