sys-libs/libhugetlbfs: Bump to version 2.22

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 580068e6d380ee1e87faed71811340016857fff0..24a91fd064fc8b48251f193ce74e480602819e0e 100644 (file)
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,2 +1,3 @@
 DIST libhugetlbfs-2.20.tar.gz 186750 BLAKE2B 758482a41254d6d14795efdfb2959248af2ff00bc6cafbae9b2002b7eaa50921a72ef928910bc0d2061a414e9c73346848eead108af077c96429870c734495aa SHA512 817fca3f8e3b127b9b877e0a03d0a94bf0c3ec481d3becf995986ce6ae0532629c5460100eb9f2ef3452ed59a3b9d3ac8362df8f87b387803c36d35ab7af0902
 DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b SHA512 87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0
+DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8

diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
new file mode 100644 (file)
index 0000000..44b5ca1
--- /dev/null
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib toolchain-funcs python-any-r1
+
+DESCRIPTION="easy hugepage access"
+HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
+SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE="static-libs test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
+)
+
+src_prepare() {
+       default
+       sed -i \
+               -e '/^PREFIX/s:/local::' \
+               -e '1iBUILDTYPE = NATIVEONLY' \
+               -e '1iV = 1' \
+               -e '/gzip.*MANDIR/d' \
+               -e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
+               -e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
+               -e 's@^\(ARCH\) ?=@\1 =@' \
+               Makefile || die "sed failed"
+       if [ "$(get_libdir)" == "lib64" ]; then
+               sed -i \
+                       -e "/^LIB\(32\)/s:=.*:= lib32:" \
+                               Makefile
+       fi
+
+       # Tarballs from github don't have the version set.
+       # https://github.com/libhugetlbfs/libhugetlbfs/issues/7
+       [[ -f version ]] || echo "${PV}" > version
+}
+
+src_compile() {
+       tc-export AR
+       emake CC="$(tc-getCC)" libs tools
+}
+
+src_install() {
+       default
+       use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
+
+src_test_alloc_one() {
+       hugeadm="$1"
+       sign="$2"
+       pagesize="$3"
+       pagecount="$4"
+       ${hugeadm} \
+               --pool-pages-max ${pagesize}:${sign}${pagecount} \
+       && \
+       ${hugeadm} \
+               --pool-pages-min ${pagesize}:${sign}${pagecount}
+       return $?
+}
+
+# die is NOT allowed in this src_test block after the marked point, so that we
+# can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
+src_test() {
+       [[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
+       einfo "Building testsuite"
+       emake -j1 tests || die "Failed to build tests"
+
+       local hugeadm='obj/hugeadm'
+       local allocated=''
+       local rc=0
+       # the testcases need 64MiB per pagesize.
+       local MIN_HUGEPAGE_RAM=$((64*1024*1024))
+
+       einfo "Planning allocation"
+       local PAGESIZES="$(${hugeadm} --page-sizes-all)"
+
+       # Need to do this before we can create the mountpoints.
+       local pagesize pagecount
+       for pagesize in ${PAGESIZES} ; do
+               # The kernel depends on the location :-(
+               mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
+               addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
+       done
+       addwrite /proc/sys/vm/
+       addwrite /proc/sys/kernel/shmall
+       addwrite /proc/sys/kernel/shmmax
+       addwrite /proc/sys/kernel/shmmni
+
+       einfo "Checking HugeTLB mountpoints"
+       ${hugeadm} --create-mounts || die "Failed to set up hugetlb mountpoints."
+
+       # -----------------------------------------------------
+       # --------- die is unsafe after this point. -----------
+       # -----------------------------------------------------
+
+       einfo "Starting allocation"
+       for pagesize in ${PAGESIZES} ; do
+               pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
+               einfo "  ${pagecount} @ ${pagesize}"
+               addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
+               src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}"
+               rc=$?
+               if [[ ${rc} -eq 0 ]]; then
+                       allocated="${allocated} ${pagesize}:${pagecount}"
+               else
+                       eerror "Failed to add ${pagecount} pages of size ${pagesize}"
+               fi
+       done
+
+       einfo "Allocation status"
+       ${hugeadm} --pool-list
+
+       if [[ -n "${allocated}" ]]; then
+               # All our allocations worked, so time to run.
+               einfo "Starting tests"
+               cd "${S}"/tests || die
+               local TESTOPTS="-t func"
+               case ${ARCH} in
+                       amd64|ppc64)
+                               TESTOPTS="${TESTOPTS} -b 64"
+                               ;;
+                       x86)
+                               TESTOPTS="${TESTOPTS} -b 32"
+                               ;;
+               esac
+               # This needs a bit of work to give a nice exit code still.
+               ./run_tests.py ${TESTOPTS}
+               rc=$?
+       else
+               eerror "Failed to make HugeTLB allocations."
+               rc=1
+       fi
+
+       einfo "Cleaning up memory"
+       cd "${S}" || die
+       # Cleanup memory allocation
+       for alloc in ${allocated} ; do
+               pagesize="${alloc/:*}"
+               pagecount="${alloc/*:}"
+               einfo "  ${pagecount} @ ${pagesize}"
+               src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+       done
+
+       # ---------------------------------------------------------
+       # --------- die is safe again after this point. -----------
+       # ---------------------------------------------------------
+
+       return ${rc}
+}