Version bump, add static-libs use flag.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 164 insertions, 10 deletions

diff --git a/sys-libs/libhugetlbfs/ChangeLog b/sys-libs/libhugetlbfs/ChangeLog
index 70dd435ee845..93cae99de649 100644
--- a/sys-libs/libhugetlbfs/ChangeLog
+++ b/sys-libs/libhugetlbfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libhugetlbfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.9 2013/05/22 05:52:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.10 2013/11/10 03:36:05 radhermit Exp $
+
+*libhugetlbfs-2.17 (10 Nov 2013)
+
+  10 Nov 2013; Tim Harder <radhermit@gentoo.org> +libhugetlbfs-2.17.ebuild:
+  Version bump, add static-libs use flag.
 
 *libhugetlbfs-2.16 (22 May 2013)
 
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 24c6797d0e13..112f40b7a5b3 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -6,22 +6,24 @@ AUX libhugetlbfs-2.6-noexec-stack.patch 1497 SHA256 24de0b668c25568b70c705dbd3e1
 AUX libhugetlbfs-2.9-build.patch 1163 SHA256 7814841600b4cbaa67d041e61a42e81c243f73f3d689b09d23744e9c943c0f78 SHA512 d6443875d2dd2e44abfd470ec793b70d0cf5a69931e2c2889a7b204d1c27bc2abc3b0c7149a495845e080cb797b759844c330ad5c467aed7dae0669b7f5b7ff2 WHIRLPOOL 42551cf59b47a0598c04a2321f9ebb1c6177ee561350ac10840ab55588f4adc07372509241c4bd47c7498bb5e786f964ef047bb10b01ad279f771e8be3727fb5
 DIST libhugetlbfs-2.15.tar.gz 178317 SHA256 1ff30080b983b2d067c9f2629e4a4dee0aa37ef664dc3a7241abedbfc8e21a24 SHA512 3e771d0e4c9998d3bc0e079a67ddf35cd18949683d6ec0c260b9e0619a79277b9644fb64bfff227350f3600dd338e6a175b245f56978eceef2624821ed768883 WHIRLPOOL e9bd6424724faa9ca25e0958391304b265e04c80bf89f1040d3efa8ce1e9166747348bce3598d21c74aaa8bbee70b6de219f30a0c027acb84f6fa35f0cda478e
 DIST libhugetlbfs-2.16.tar.gz 178982 SHA256 1a473ebc70e80d8c452f359b05bc45d1fb87e6e2425d216c06486e30acf86ed2 SHA512 0bc0d301c0c5e237a2fd2c518a084b19b06b658fbabfcdcf85c9545236f6d068ca8e064bb4fd8479d6460834f28b2a1491c7255f047a08b512803761e029e7e8 WHIRLPOOL 4b3c6a46f4d6464c7981e9892d7f6badbd68774845fc5ead299e4179960178cb7f9fb34fe4f0a037165904fb5ac8132697d213974a3378892eed42c49e46560f
+DIST libhugetlbfs-2.17.tar.gz 180829 SHA256 3ef1dd19ebeefe2cefaf8bdbc40400dbfb9b3c546a7e4cf2ab0cdf381ff7fe93 SHA512 2821a784b0246906f6d1e7c8ce3e883ca516892a3d88d4abfb49ee73709bf0ea76edcc01c36209f5634f8fdebcb7a9f1c84cc64110d9e8f0e8779169a93b2a29 WHIRLPOOL 7cd5e433b7e6f479bafdd9d6718adf7440d40c68f9fe8323036c73acac8fbb5e3be737821c31a3b620f5f33a6c84288078f2577f7e65c48dd7b99184c66797ea
 DIST libhugetlbfs-2.6.tar.gz 148202 SHA256 6195fdecee0b370d8a82c76a6c2a5b9892e547de319d8a7f52138a796505e890
 DIST libhugetlbfs-2.9.tar.gz 167149 SHA256 8f2adfb85ef5cf83b6024f4249514751901cfea0bb663b7812eac07cae8e8623 SHA512 b83eaa734552c795c8555afa4e29ba0914ab14257870c94d8249c4dcfb773e0024210c3199159efbe33a0710437162a6b0ff03971551dfe553dbb0ccb7710bef WHIRLPOOL 8a57e62043ab191a40f7e1abaae4470e8a7f305e875aec3233c67b1fb068ed8132effb078bf4e6542b56f0f4c9865d0d707795bb4a49b7f0b81efce750c0b47a
 EBUILD libhugetlbfs-2.15.ebuild 3903 SHA256 7cbeb06c9419afa87b44297b82ca8ba5f7fc464a21ab60266eda72fc0d4b2062 SHA512 9da2dbc5034e1c49a0af659f41def0679851845fd480c26793c23c294d73aef713d49b1577d074dcdf3c0e7a8886c763da21139c6d836e8d1d83158fb59bba23 WHIRLPOOL ab4aa6c746e289f41f1db51fa746322c1969119fbd07c92d20d387240d2bae05182d80843604610601dd16dfdea0f4f60729c11c1eac58ce32d2bf4fef952397
 EBUILD libhugetlbfs-2.16.ebuild 3842 SHA256 e8802b2a5b52d1e48775d56f8e3b4f60a23bd191bd3c1978bfecec1e8719c496 SHA512 b0e60c4318409b7af03fe8d1cce57f4e9bc783917b1e38fc3ae14e8330164fffa2b3bf8cedba913ff238cd32886e4b9ab8d99979c2b4b3db7f0886df71ecb153 WHIRLPOOL 08829c3ad3c9d67bef2de577f2a3c8fcf6a848dc0cc90171a6f02cd1f655b21306cb4ddde844d3ed111590bc1efedce1656f7926dc2c6b8f24e2ca796ac41cad
+EBUILD libhugetlbfs-2.17.ebuild 3937 SHA256 fb8bd7aa8ff1536c127817060ed87de712797ec8c8ec82c96c84a26a83d718ae SHA512 3ff54a6a960c0c5d28ccb3d66e5d1c420bc072863533f75a13f13162da9dc02878dea1cf2cf8fd535f7132f320a23c5a0b63d3a39c7c68c48bdabd13deba49d0 WHIRLPOOL 9bb382456a3d732f89d25ccf44c73014aec893a8d704f1af4c74db95b3ca7a5424184f280f4b9f9c67147f568b64e1665cf611bd9ec44df9f41a50aef2f1000e
 EBUILD libhugetlbfs-2.6.ebuild 3889 SHA256 21fb0ca8a1f7970cd00f24a0acd1f5cc339a798f5da9671916371873a6d32f9a SHA512 fde9481e866dd71b05fbda7316aeb8bb5f64c2bf4b71f0ab011b185c722ac913186236a150be66ec6a334351c5771aa050462db47c1d81d62b781be966c3f9fc WHIRLPOOL 653f5dd08008a9b77b35eb8750aa5ac2e7959d5af15d68d02753ab91b37b609999f020d3a6437ae86315919f70d3ac343a5a67f084fa82520724e68e37306773
 EBUILD libhugetlbfs-2.9.ebuild 3916 SHA256 d0880023bc49724cf10c01c88cf99037a192b654d689cdad3fdf92c019f8d8ef SHA512 0ae32184fa5130629033909eae4d5aa417f1f89d4504cb423ea93c84f3661ffe3082fe18375fc0aea2b1d1d525f70f55bf0a40b895dd8dc1ece4721ea6672f17 WHIRLPOOL 6b01852eadda7cabd230001a7957e7bf764707eefc894134c997e58d55f8d6999b41e8a9f40f632a36759ce35b4c75561d35ddec91d3cd087e4fb81d18d37535
-MISC ChangeLog 1723 SHA256 4dd2efd708395f88e5b99748c1542853adf99ad0f4d797e381df7ff5a7365da8 SHA512 6ee7dfdbd0c572876ae53f3dacdeec37c2dbf05fb06bdc4349a82af9cc2bd64f6777c815f22b5f9e64b2edfcd6ed781f60f571d4aef0ebafb88e0defe477de50 WHIRLPOOL 21eae0c2adfa146a9a9de9ebac8f5f2249534923ddf3cb18bce78effc5ce865ee307ecdd512035fb3bf4864fb3c168a2125d9c930cac045f032e3c5712267d10
+MISC ChangeLog 1877 SHA256 c532eb90b35b9415c0896d1130655085d9d9656c364d008dd01e0c3b9d86dd9b SHA512 4d4df036f0cdc1612b561a78f1e85dbde7f1ee5c46cb1d6aef5f367579b22e459dc58ac333869c8fd73348cf0eea93bfe7bc81a4c726e828d3c3072af034677e WHIRLPOOL 4a0708914d814abd0ad1c25ef3691dc3846c47475fdb080789751d0c3536e9881f405fefe69c2fbb7ef10bcaf96c6a18fd7403827822f3a83030c63918a59926
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRnF01AAoJEEqz6FtPBkyjSSUIAJ+jL3t4RKSW7Kw9bVIVm4+L
-X5BJYiFEI4sFCYM3GSC1h/5yBIdXKbKDjA4XoqZOdIm2ZtHd/RC50It3s7SuQs9G
-8yLuISgbLWyeNLH7WhgVtgBkuuhcvVzq3tLTIxxD5HmMUHsazYy6qeUBK8i1B0zH
-Ovm52p1djPs/FKpGGOS2bZLRMzdRKbaAT8I/iCVqFh0fVzqyCLI2aORDsT4TcIvu
-rE+E4QUYrih0z9izUEpXZtFwhDwvNB8RvI04alRwmIObnAlZpMX1anRQ+8yp78Zm
-F573f05HO1Dui+dFE/GXJ7R6BlTYMHJkuiIiKPSlV6AtJoNp3MWfkVefATpimhg=
-=ifrP
+iQEcBAEBCAAGBQJSfv8mAAoJEEqz6FtPBkyj7r4IAJq47DUsFazQyqLVaFMHe3Ko
+xVcYK30j6GidF5RO2nYqfYtr0+lD6Fcufmd2KlH32YlsVdDXp+F0CVdcU70EhwVv
+LxKco7/Eo3/Ap8j4LVjoQWFd3HtksYd38WpF+BATiRri2FPE5ca5cC7GWM/+VzlA
+jD3rjp9VHBt4fOtn3nrW/AaGwzT85l4JLe5YTpB/b9l3YTCEIs20w8SzyCO/oQu8
+OQnoUGiX54Y1TUHpRAVk0a2LyEEVWfL+KY3ZPESvEwntV9vFnFogvWQtYbIAdx0A
+kyP+Snr7RRzZHNdGYNOJUXtQ5QecUQXwFWOg4ie0d9GGxQLbTu2oBIy+G+43EJg=
+=BZMB
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.17.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.17.ebuild
new file mode 100644
index 000000000000..67d7db55b84d
--- /dev/null
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.17.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/libhugetlbfs-2.17.ebuild,v 1.1 2013/11/10 03:36:05 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="easy hugepage access"
+HOMEPAGE="http://libhugetlbfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517
+	epatch "${FILESDIR}"/${PN}-2.6-noexec-stack.patch
+	epatch "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
+	sed -i \
+		-e '/^PREFIX/s:/local::' \
+		-e '1iBUILDTYPE = NATIVEONLY' \
+		-e '1iV = 1' \
+		-e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
+		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
+		Makefile
+	if [ "$(get_libdir)" == "lib64" ]; then
+		sed -i \
+			-e "/^LIB\(32\)/s:=.*:= lib32:" \
+				Makefile
+	fi
+}
+
+src_compile() {
+	tc-export AR
+	emake CC="$(tc-getCC)" libs tools
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/*.a
+	rm "${D}"/usr/bin/oprofile* || die
+}
+
+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"
+
+	hugeadm='obj/hugeadm'
+	allocated=''
+	rc=0
+	# the testcases need 64MiB per pagesize.
+	MIN_HUGEPAGE_RAM=$((64*1024*1024))
+
+	einfo "Planning allocation"
+	PAGESIZES="$(${hugeadm} --page-sizes-all)"
+
+	# Need to do this before we can create the mountpoints.
+	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
+		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}"
+	# 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
+}