From 211c8d62f68871d851eb6097a912b9449b27aa6f Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 27 Jun 2018 02:49:22 -0700 Subject: hwloc: Upgrade to 1.11.10 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb | 31 +++++++++++++++++++++++++ meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb | 31 ------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb delete mode 100644 meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb new file mode 100644 index 0000000000..701af15313 --- /dev/null +++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb @@ -0,0 +1,31 @@ +SUMMARY = "Portable Hardware Locality (hwloc) software package" +DESCRIPTION = "The Portable Hardware Locality (hwloc) software package \ + provides a portable abstraction of the hierarchical topology of modern \ + architectures." +HOMEPAGE = "https://www.open-mpi.org/software/hwloc/" +SECTION = "base" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" + +SRC_URI = "https://www.open-mpi.org/software/${PN}/v1.11/downloads/${BP}.tar.bz2" +SRC_URI[md5sum] = "0981a01935982aa7e850a96e0c3057b0" +SRC_URI[sha256sum] = "2be808383d8337846fe77ce49c7ad3336fb6857505494d85c0ac03f22c5bd1e7" + +UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/" + +inherit autotools pkgconfig + +DEPENDS += "ncurses udev zlib" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +PACKAGECONFIG ?= "pci libxml2 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +PACKAGECONFIG[numactl] = "--enable-libnuma,--disable-libnuma,numactl,numactl" +PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2,libxml2" +PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo" +PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess" + +# Split hwloc library into separate subpackage +PACKAGES_prepend = " libhwloc " +FILES_libhwloc += "${libdir}/libhwloc.so.*" +RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb deleted file mode 100644 index 4fe6729ca3..0000000000 --- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Portable Hardware Locality (hwloc) software package" -DESCRIPTION = "The Portable Hardware Locality (hwloc) software package \ - provides a portable abstraction of the hierarchical topology of modern \ - architectures." -HOMEPAGE = "https://www.open-mpi.org/software/hwloc/" -SECTION = "base" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" - -SRC_URI = "https://www.open-mpi.org/software/${PN}/v1.11/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "96c34136ff416d2b13a7821c27477bed" -SRC_URI[sha256sum] = "95d80286dfe658a3f79e2ac90698782bb36e5504f4bac1bba2394ba14dbbad24" - -UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/" - -inherit autotools pkgconfig - -DEPENDS += "ncurses udev zlib" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -PACKAGECONFIG ?= "pci libxml2 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -PACKAGECONFIG[numactl] = "--enable-libnuma,--disable-libnuma,numactl,numactl" -PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2,libxml2" -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo" -PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess" - -# Split hwloc library into separate subpackage -PACKAGES_prepend = " libhwloc " -FILES_libhwloc += "${libdir}/libhwloc.so.*" -RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})" -- cgit v1.2.3-54-g00ecf