Version bump so it can be used for new memcached fun. src_test needs some work still.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 143 insertions, 13 deletions

diff --git a/sys-libs/libhugetlbfs/ChangeLog b/sys-libs/libhugetlbfs/ChangeLog
index 65d47360899f..08dc2b69f7b9 100644
--- a/sys-libs/libhugetlbfs/ChangeLog
+++ b/sys-libs/libhugetlbfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libhugetlbfs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.2 2008/02/05 21:39:00 tgall Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/ChangeLog,v 1.3 2009/10/31 07:59:56 robbat2 Exp $
+
+*libhugetlbfs-2.6 (31 Oct 2009)
+
+  31 Oct 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +libhugetlbfs-2.6.ebuild, +files/libhugetlbfs-2.6-noexec-stack.patch:
+  Version bump so it can be used for new memcached fun. src_test needs some
+  work still.
 
 *libhugetlbfs-1.2 (5 Feb 2008)
 
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 3b448574381d..1f0dd6dc6d22 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libhugetlbfs-1.1-build.patch 1275 RMD160 840cc7e91291b61b6fee47feb429b87b5727be97 SHA1 0758877ee54637718fc3d9fbf9cf05bb7287c0cb SHA256 69cc6d33e8a6cac6d5ae3ee96b9192b342e60e6953d48c145706a1963d88e6c3
+AUX libhugetlbfs-2.6-noexec-stack.patch 1497 RMD160 1e776f4fda19798084dd5bcc6872a15fd543b1d5 SHA1 cff4e5a2dbabe1b3fde7c73cb663ae87ef70362d SHA256 24de0b668c25568b70c705dbd3e1533c6358ad774ee96720b963ab7cd5226f2f
 DIST libhugetlbfs-1.1.tar.gz 66438 RMD160 10a95c9e10e99c0b85a57db10da8dbfd6d41e1c9 SHA1 aa36f828d914b0af5ec047b4101c2e67777b46c7 SHA256 dc349626b79762987a7fe98c75914f7af2c9ce314dc395944cdc5d477992547e
 DIST libhugetlbfs-1.2.tar.gz 71275 RMD160 73ebdafead3196f00f1685e2e420a314c7523d7a SHA1 d01dcc3f517824b3a4b21bb1405907379528b6b8 SHA256 c47a553ef1affb5a773df0e50ef4fbb399541e0e9274459b0d3225e12d149649
+DIST libhugetlbfs-2.6.tar.gz 148202 RMD160 541d98c6c5828ec57dc374657596ea1cac8b141e SHA1 eec97b9ae34bce559f7eaf977eeb215359cca141 SHA256 6195fdecee0b370d8a82c76a6c2a5b9892e547de319d8a7f52138a796505e890
 EBUILD libhugetlbfs-1.1.ebuild 882 RMD160 39a7ef709a76dd54b26868eace3af30938e5fef4 SHA1 7b67b66454a3718833c93ad5477fa870d1547ac6 SHA256 33469abd1afacc34ff79ad139ebab0f0bc2e8ba6b521800450d70f3ee4f10b20
 EBUILD libhugetlbfs-1.2.ebuild 850 RMD160 e97b8c78e2a2abfc0a79e0731fbf1218ccb8a644 SHA1 038a7aa318bc74c684d331a7b2c37c34ae671440 SHA256 21c95cbc203f12b1dc020a651d9c94b0ad9551fa5708b840e445972579d1c561
-MISC ChangeLog 470 RMD160 fb3512e8895fabf694484a848bcb019c0a5bde43 SHA1 3c09815a222fc1bed96bc36cda41212aa75fdd94 SHA256 74f54c9667499f3eeb1f609bc416b2060c12f75e319a375e8b7925c7aae79b43
+EBUILD libhugetlbfs-2.6.ebuild 1892 RMD160 c6f29eda0d8db9107fbf007155f7eadc861ec917 SHA1 0acf8430b856deb2c5a8dc7966efebf487d7d68b SHA256 ae2dc8596014c0bbc46577e936b965d78a2d06684bdb831f91a35a88fba8abeb
+MISC ChangeLog 721 RMD160 dbb7b182dbf5820800af08499e072063b21a8a66 SHA1 e2760eacac1c60e349cdb51a279a7aefefc45cc0 SHA256 1c840babebae8675740870a1290bb9ffc532a35aaffd5924a6b5f23ad20f9406
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH4n4Rj9hvisErhMIRAhWUAKDrvV0t3fdZ2K1QIoj3EKIxq17dYQCgjOsr
-fRr9PWyxk4Rm8oFsZFEKEik=
-=lWPt
------END PGP SIGNATURE-----
diff --git a/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-noexec-stack.patch b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-noexec-stack.patch
new file mode 100644
index 000000000000..bf964cda7a68
--- /dev/null
+++ b/sys-libs/libhugetlbfs/files/libhugetlbfs-2.6-noexec-stack.patch
@@ -0,0 +1,44 @@
+diff -Nuar libhugetlbfs-2.6.orig/sys-elf32ppclinux.S libhugetlbfs-2.6/sys-elf32ppclinux.S
+--- libhugetlbfs-2.6.orig/sys-elf32ppclinux.S	2009-08-24 12:56:07.000000000 +0000
++++ libhugetlbfs-2.6/sys-elf32ppclinux.S	2009-10-31 06:43:49.040319417 +0000
+@@ -32,3 +32,7 @@
+ 	mr	8,9
+ 	sc
+ 	blr
++
++#if defined(__linux__) && defined(__ELF__)
++	.section .note.GNU-stack,"",%progbits
++#endif
+diff -Nuar libhugetlbfs-2.6.orig/sys-elf64ppc.S libhugetlbfs-2.6/sys-elf64ppc.S
+--- libhugetlbfs-2.6.orig/sys-elf64ppc.S	2009-08-24 12:56:07.000000000 +0000
++++ libhugetlbfs-2.6/sys-elf64ppc.S	2009-10-31 06:43:54.303652251 +0000
+@@ -41,3 +41,7 @@
+ 	mr	8,9
+ 	sc
+ 	blr
++
++#if defined(__linux__) && defined(__ELF__)
++	.section .note.GNU-stack,"",%progbits
++#endif
+diff -Nuar libhugetlbfs-2.6.orig/sys-elf_i386.S libhugetlbfs-2.6/sys-elf_i386.S
+--- libhugetlbfs-2.6.orig/sys-elf_i386.S	2009-08-24 12:56:07.000000000 +0000
++++ libhugetlbfs-2.6/sys-elf_i386.S	2009-10-31 06:43:57.536975670 +0000
+@@ -40,3 +40,7 @@
+ 	pop	%edi
+ 	pop	%ebp
+ 	ret
++
++#if defined(__linux__) && defined(__ELF__)
++	.section .note.GNU-stack,"",%progbits
++#endif
+diff -Nuar libhugetlbfs-2.6.orig/sys-elf_x86_64.S libhugetlbfs-2.6/sys-elf_x86_64.S
+--- libhugetlbfs-2.6.orig/sys-elf_x86_64.S	2009-08-24 12:56:07.000000000 +0000
++++ libhugetlbfs-2.6/sys-elf_x86_64.S	2009-10-31 06:44:26.943648847 +0000
+@@ -32,3 +32,7 @@
+ 	mov	0x8(%rsp),%r9
+ 	syscall
+ 	retq
++
++#if defined(__linux__) && defined(__ELF__)
++	.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.6.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.6.ebuild
new file mode 100644
index 000000000000..20b0df493f0f
--- /dev/null
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhugetlbfs/libhugetlbfs-2.6.ebuild,v 1.1 2009/10/31 07:59:56 robbat2 Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="easy hugepage access"
+HOMEPAGE="http://libhugetlbfs.ozlabs.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+# testsuite requires specific kernel options, and LOTS of free memory.
+# with 16GiB of RAM available, I hit swap :-) - robbat2
+RESTRICT=test
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6-noexec-stack.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_configure() {
+	:
+}
+
+src_compile() {
+	tc-export AR CC
+	emake libs tools || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc HOWTO NEWS README
+	rm "${D}"/usr/bin/oprofile*
+}
+
+src_test() {
+	emake tests || die "Failed to build tests"
+	hugeadm='obj/hugeadm'
+	${hugeadm} --create-mounts
+	PAGESIZES="$(${hugeadm} --page-sizes-all)"
+	MIN_HUGEPAGE_RAM=$((64*1024*1024))
+	ALLOCATED=''
+	for p in ${PAGESIZES} ; do
+		pagecount=$((${MIN_HUGEPAGE_RAM}/${p}))
+		${hugeadm} \
+		--pool-pages-min ${p}:+${pagecount} \
+		--pool-pages-max ${p}:+${pagecount} \
+		&& ALLOCATED="${ALLOCATED} ${p}:${pagecount}" \
+		|| die "Failed to set pages"
+	done
+	cd "${S}"/tests
+	TESTOPTS="-t func"
+	case $ARCH in
+		amd64|ppc64)
+			TESTOPTS="${TESTOPTS} -b 64"
+			;;
+		x86)
+			TESTOPTS="${TESTOPTS} -b 32"
+			;;
+	esac
+	./run_tests.py ${TESTOPTS}
+	# TODO: undo the allocation here.
+	for p in ${ALLOCATED} ; do
+		:
+	done
+}
+
+