diff options
Diffstat (limited to 'sys-libs/libhugetlbfs')
-rw-r--r-- | sys-libs/libhugetlbfs/Manifest | 7 | ||||
-rw-r--r-- | sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-uncompressed-man-pages.patch | 34 | ||||
-rw-r--r-- | sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild | 2 | ||||
-rw-r--r-- | sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild (renamed from sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild) | 34 |
4 files changed, 57 insertions, 20 deletions
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest index c7fa61c117e1..b8f77f6009dd 100644 --- a/sys-libs/libhugetlbfs/Manifest +++ b/sys-libs/libhugetlbfs/Manifest @@ -1,6 +1,7 @@ +AUX libhugetlbfs-2.23-uncompressed-man-pages.patch 1515 BLAKE2B b43415a3059f1071f0fc04ec834cd51d87a8bd93f2df6b428a33296b1b55745f23861415a463d5899b12699c5f4a3e5bdd837a8ec2894d1fc89039924330d77d SHA512 ea3ef19a688866676315af59422233681a41338fd049cfa50ed91f660f0baf1950ba056b9fcd540e6694b8ec348c0d1fbb3aa6b8c1840e22a77634e26555c9bc AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80 -DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b SHA512 87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0 DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8 -EBUILD libhugetlbfs-2.21.ebuild 4061 BLAKE2B 93e5777e62c7002285854bda8e2f6b7560ef4a2a00347407bee21d0bbba46ed4e9b0d21f5b054c65a05564271c5a39efd1989131735eac257dec270c8a8bf4a0 SHA512 19b644e0e4c67417ca4e3e3c8da804f00efecb13a68f241eaafc869183c1512e96099fbc6b528cf87484119d6e31cdd692ccd9b90d16e87dd551574a5a5ef753 -EBUILD libhugetlbfs-2.22.ebuild 4147 BLAKE2B 24cda5809fe5c341f5db4edc76d5fb22076a9f15746de30b101f1bbf15e0b2539546ee17969b16dcf6a7e8e93a18d3a9353eac5ea17bce6b72cb75570971f697 SHA512 27e6859a338099acf6437411c6ba51ba294ea0e8ab4abddb120b76dbb1abea23d571ce84e8f30ec71564a32b1cd175c8434f1b057e278da8671b24bdbff10c1f +DIST libhugetlbfs-2.23.tar.gz 175459 BLAKE2B f469ff9a65364e9f0e04c11c8010c958855ebd4d50e1dd719576cda7c280586623404304be64a794907a5fb1d97bd9c0620a91d7a2492577e04fa40ff432b4c7 SHA512 fc9a7d59bcda9d3ca9c9e43a3a348f989c9cbdbbb77f21a43a06e71eacd05bbe5a7b2b51e20ae9ea00da9f1c4d1130da529bbfb702e8c9d11cab6efadd3dc168 +EBUILD libhugetlbfs-2.22.ebuild 4151 BLAKE2B 2c3b3a749a70b4f7948c0ba9accf6e8925e68ed7a47632253a915a8d5f49c3523b29cad91495c504c8ea8d32f7908e6bb8e87bb29a7211c1bd5562dd3b9f36aa SHA512 b721f102e9098219a14cbe46c8dc10ec74bf99c9eddfc21d4921d1bf88627ea6da885bc31eca32bbda09e9e54c2b219f0725fd4041f0b88b5c573a28fec892b7 +EBUILD libhugetlbfs-2.23.ebuild 4206 BLAKE2B 7c5644df49b210f4adabdf72e8f3c7c9a693107049072a0df4c694ac11ef0dfd506d7a5c6033f6c78942b0ce15bad3a73c99f9c4919fb8c3c203bf29b25a5547 SHA512 fe71f4b377678d433e966b8d791b9fc0669c9ff7916ff470113af8e6e97ccb545bc6b681ba4de48743d311eb7020b06b2bb92145919d08057674add9399112b8 MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8 diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-uncompressed-man-pages.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-uncompressed-man-pages.patch new file mode 100644 index 000000000000..c0ca6a398e70 --- /dev/null +++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.23-uncompressed-man-pages.patch @@ -0,0 +1,34 @@ +--- a/Makefile ++++ b/Makefile +@@ -436,27 +436,19 @@ install-man: + $(INSTALL) -d $(DESTDIR)$(MANDIR8) + for x in $(INSTALL_MAN1); do \ + $(INSTALL) -m 444 man/$$x $(DESTDIR)$(MANDIR1); \ +- gzip -f $(DESTDIR)$(MANDIR1)/$$x; \ + done + for x in $(INSTALL_MAN3); do \ + $(INSTALL) -m 444 man/$$x $(DESTDIR)$(MANDIR3); \ +- gzip -f $(DESTDIR)$(MANDIR3)/$$x; \ + done +- rm -f $(DESTDIR)$(MANDIR3)/free_huge_pages.3.gz +- rm -f $(DESTDIR)$(MANDIR3)/free_hugepage_region.3.gz +- rm -f $(DESTDIR)$(MANDIR3)/hugetlbfs_unlinked_fd_for_size.3.gz +- rm -f $(DESTDIR)$(MANDIR3)/hugetlbfs_find_path_for_size.3.gz +- ln -s get_huge_pages.3.gz $(DESTDIR)$(MANDIR3)/free_huge_pages.3.gz +- ln -s get_hugepage_region.3.gz $(DESTDIR)$(MANDIR3)/free_hugepage_region.3.gz +- ln -s hugetlbfs_unlinked_fd.3.gz $(DESTDIR)$(MANDIR3)/hugetlbfs_unlinked_fd_for_size.3.gz +- ln -s hugetlbfs_find_path.3.gz $(DESTDIR)$(MANDIR3)/hugetlbfs_find_path_for_size.3.gz ++ ln -s get_huge_pages.3 $(DESTDIR)$(MANDIR3)/free_huge_pages.3 ++ ln -s get_hugepage_region.3 $(DESTDIR)$(MANDIR3)/free_hugepage_region.3 ++ ln -s hugetlbfs_unlinked_fd.3 $(DESTDIR)$(MANDIR3)/hugetlbfs_unlinked_fd_for_size.3 ++ ln -s hugetlbfs_find_path.3 $(DESTDIR)$(MANDIR3)/hugetlbfs_find_path_for_size.3 + for x in $(INSTALL_MAN7); do \ + $(INSTALL) -m 444 man/$$x $(DESTDIR)$(MANDIR7); \ +- gzip -f $(DESTDIR)$(MANDIR7)/$$x; \ + done + for x in $(INSTALL_MAN8); do \ + $(INSTALL) -m 444 man/$$x $(DESTDIR)$(MANDIR8); \ +- gzip -f $(DESTDIR)$(MANDIR8)/$$x; \ + done + + install-bin: diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild index d0f6b415a629..255bcb160f23 100644 --- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild +++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit multilib toolchain-funcs python-any-r1 diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild index 8afaeb6120b1..509763949e6a 100644 --- a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild +++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit multilib toolchain-funcs python-any-r1 @@ -21,6 +21,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )" PATCHES=( "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch + "${FILESDIR}"/${PN}-2.23-uncompressed-man-pages.patch ) src_prepare() { @@ -52,7 +53,7 @@ src_compile() { src_install() { default - use static-libs || rm -f "${ED%/}"/usr/$(get_libdir)/*.a + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a } src_test_alloc_one() { @@ -75,16 +76,17 @@ src_test() { einfo "Building testsuite" emake -j1 tests - hugeadm='obj/hugeadm' - allocated='' - rc=0 + local hugeadm='obj/hugeadm' + local allocated='' + local rc=0 # the testcases need 64MiB per pagesize. - MIN_HUGEPAGE_RAM=$((64*1024*1024)) + local MIN_HUGEPAGE_RAM=$((64*1024*1024)) einfo "Planning allocation" - PAGESIZES="$(${hugeadm} --page-sizes-all)" + 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} @@ -107,9 +109,9 @@ src_test() { pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize})) einfo " ${pagecount} @ ${pagesize}" addwrite /var/lib/hugetlbfs/pagesize-${pagesize} - src_test_alloc_one "$hugeadm" "+" "${pagesize}" "${pagecount}" + src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}" rc=$? - if [[ $rc -eq 0 ]]; then + if [[ ${rc} -eq 0 ]]; then allocated="${allocated} ${pagesize}:${pagecount}" else eerror "Failed to add ${pagecount} pages of size ${pagesize}" @@ -122,9 +124,9 @@ src_test() { if [[ -n "${allocated}" ]]; then # All our allocations worked, so time to run. einfo "Starting tests" - cd "${S}"/tests - TESTOPTS="-t func" - case $ARCH in + cd "${S}"/tests || die + local TESTOPTS="-t func" + case ${ARCH} in amd64|ppc64) TESTOPTS="${TESTOPTS} -b 64" ;; @@ -141,7 +143,7 @@ src_test() { fi einfo "Cleaning up memory" - cd "${S}" + cd "${S}" || die # Cleanup memory allocation for alloc in ${allocated} ; do pagesize="${alloc/:*}" @@ -154,5 +156,5 @@ src_test() { # --------- die is safe again after this point. ----------- # --------------------------------------------------------- - return $rc + return ${rc} } |