diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2011-12-11 17:22:34 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2011-12-11 17:22:34 +0000 |
| commit | 73fd160e18b9743166fc8d464a8ab0b68e7f8147 (patch) | |
| tree | 60dcb812d87a370d523abd892def4add23098845 /sys-boot | |
| parent | Version bump wrt bug #393423 (diff) | |
| download | gentoo-2-73fd160e18b9743166fc8d464a8ab0b68e7f8147.tar.gz gentoo-2-73fd160e18b9743166fc8d464a8ab0b68e7f8147.tar.bz2 gentoo-2-73fd160e18b9743166fc8d464a8ab0b68e7f8147.zip | |
Add patch to fix build failure with glibc-2.13, patch by Sergei Trofimovich <slyfox at gentoo dot org>, bug #364697
(Portage version: 2.1.10.38/cvs/Linux ia64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/aboot/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild | 5 | ||||
| -rw-r--r-- | sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch | 35 |
3 files changed, 46 insertions, 2 deletions
diff --git a/sys-boot/aboot/ChangeLog b/sys-boot/aboot/ChangeLog index f50ad5c893ca..904ace460c05 100644 --- a/sys-boot/aboot/ChangeLog +++ b/sys-boot/aboot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-boot/aboot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.17 2011/04/02 12:00:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.18 2011/12/11 17:22:34 armin76 Exp $ + + 11 Dec 2011; Raúl Porcel <armin76@gentoo.org> + aboot-1.0_pre20040408-r3.ebuild, + +files/aboot-define_stat_only_in_userspace.patch: + Add patch to fix build failure with glibc-2.13, patch by Sergei Trofimovich + <slyfox at gentoo dot org>, bug #364697 02 Apr 2011; Raúl Porcel <armin76@gentoo.org> aboot-1.0_pre20040408-r3.ebuild: diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild index fa6ec4433dcd..b522b43a2bd0 100644 --- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild +++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.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/aboot/aboot-1.0_pre20040408-r3.ebuild,v 1.3 2011/04/02 12:00:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild,v 1.4 2011/12/11 17:22:34 armin76 Exp $ inherit eutils @@ -31,6 +31,9 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/aboot-gcc-3.4.patch" epatch "${FILESDIR}/aboot-pt_note.patch" + # Bug 364697 + epatch "${FILESDIR}/aboot-define_stat_only_in_userspace.patch" + # Modified patch from Debian to add netboot support epatch "${WORKDIR}"/aboot_gentoo.diff } diff --git a/sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch b/sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch new file mode 100644 index 000000000000..5b0b5e0efedf --- /dev/null +++ b/sys-boot/aboot/files/aboot-define_stat_only_in_userspace.patch @@ -0,0 +1,35 @@ +# Patch by Sergei Trofimovich +# http://bugs.gentoo.org/364697 + +diff --git a/Makefile b/Makefile +index bbe3b60..b4245af 100644 +--- a/Makefile ++++ b/Makefile +@@ -138,10 +138,10 @@ distclean: clean + find . -name \*~ | xargs rm -f + + lib/%: +- make -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)" ++ make -C lib $* CPPFLAGS="$(CPPFLAGS) -D__KERNEL__" TESTING="$(TESTING)" + + tools/%: +- make -C tools $* CPPFLAGS="$(CPPFLAGS)" ++ make -C tools $* CPPFLAGS="$(CPPFLAGS) -U__KERNEL__" + + sdisklabel/%: + make -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)" +diff --git a/include/isolib.h b/include/isolib.h +index 392327a..0ef6e2a 100644 +--- a/include/isolib.h ++++ b/include/isolib.h +@@ -7,7 +7,10 @@ + # define fd_set kernel_fd_set + #endif + ++#ifdef __KERNEL__ ++/* userspace stuff has it's own struct stat */ + #include <asm/stat.h> ++#endif + + extern int iso_read_super (void * data, int quiet); + extern int iso_open (const char * filename); |