diff options
| author |   Joseph Jezak <josejx@gentoo.org> | 2011-05-22 07:48:58 +0000 |
|---|---|---|
| committer | Joseph Jezak <josejx@gentoo.org> | 2011-05-22 07:48:58 +0000 |
| commit | a7cab52e1f74da2900751e7ab358410a867ac719 (patch) | |
| tree | e81e5a5c818359107581a9365baf19f5998d2aca /sys-boot | |
| parent | Added 5.4 and 5.5 to PHP_USE (diff) | |
| download | gentoo-2-a7cab52e1f74da2900751e7ab358410a867ac719.tar.gz gentoo-2-a7cab52e1f74da2900751e7ab358410a867ac719.tar.bz2 gentoo-2-a7cab52e1f74da2900751e7ab358410a867ac719.zip | |
Marked ppc stable. Added patch from bug #352281.
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/yaboot/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch | 41 | ||||
| -rw-r--r-- | sys-boot/yaboot/yaboot-1.3.16.ebuild | 7 |
3 files changed, 51 insertions, 3 deletions
diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog index d51f009ed6bf..e986fc7daca0 100644 --- a/sys-boot/yaboot/ChangeLog +++ b/sys-boot/yaboot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/yaboot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.36 2011/04/10 14:23:30 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.37 2011/05/22 07:48:57 josejx Exp $ + + 22 May 2011; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.16.ebuild, + +files/yaboot-1.3.16-memalign.patch: + Marked ppc stable. Added patch from bug #352281. 10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> yaboot-1.3.14-r2.ebuild, yaboot-1.3.16.ebuild: diff --git a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch b/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch new file mode 100644 index 000000000000..0fe4e250f292 --- /dev/null +++ b/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch @@ -0,0 +1,41 @@ +diff -uNr yaboot/lib/malloc.c yaboot-1.3.16//lib/malloc.c +--- yaboot/lib/malloc.c 2010-07-09 03:18:17.000000000 +0100 ++++ yaboot-1.3.16//lib/malloc.c 2011-01-23 16:57:13.000000000 +0000 +@@ -42,6 +42,37 @@ + last_alloc = 0; + } + ++static char *align_ptr_to(char *ptr, unsigned long align) ++{ ++ return (char *)((((unsigned long)ptr) + (align - 1UL)) & ++ ~(align - 1UL)); ++} ++ ++int posix_memalign(void **memptr, unsigned long alignment, unsigned long size) ++{ ++ char *caddr; ++ ++ if (alignment & (alignment - 1UL)) ++ return -1; ++ ++ if (alignment & (sizeof(void *) - 1UL)) ++ return -1; ++ ++ if (size == 0) ++ { ++ *memptr = (void *)0; ++ return 0; ++ } ++ ++ caddr = align_ptr_to(malloc_ptr, alignment); ++ malloc_ptr = (caddr + size); ++ last_alloc = caddr; ++ malloc_ptr = align_ptr_to(malloc_ptr, 8UL); ++ ++ *memptr = caddr; ++ return 0; ++} ++ + void *malloc (unsigned int size) + { + char *caddr; diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild b/sys-boot/yaboot/yaboot-1.3.16.ebuild index 5f5d83e5dcd3..ec8c6f02361d 100644 --- a/sys-boot/yaboot/yaboot-1.3.16.ebuild +++ b/sys-boot/yaboot/yaboot-1.3.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.4 2011/04/10 14:23:30 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.16.ebuild,v 1.5 2011/05/22 07:48:57 josejx Exp $ inherit eutils toolchain-funcs @@ -9,7 +9,7 @@ SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz" HOMEPAGE="http://yaboot.ozlabs.org" SLOT="0" LICENSE="GPL-2" -KEYWORDS="-* ~ppc -ppc64" +KEYWORDS="-* ppc -ppc64" IUSE="ibm" DEPEND="sys-apps/powerpc-utils" @@ -31,6 +31,9 @@ src_unpack() { if [[ "$(gcc-major-version)" -eq "4" ]]; then epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch" fi + + # e2fsprogs memalign patch + epatch "${FILESDIR}/${P}-memalign.patch" } src_compile() { |