diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-11 14:04:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-11 14:04:23 +0000 |
| commit | 56d29b362676362d932d5f93613e8341298cd759 (patch) | |
| tree | 6ef20101419fb73eac405479b991edc8ab2b145a /sys-fs/btrfs-progs | |
| parent | Let the Makefile respect LDFLAGS (bug #332221). (diff) | |
| download | gentoo-2-56d29b362676362d932d5f93613e8341298cd759.tar.gz gentoo-2-56d29b362676362d932d5f93613e8341298cd759.tar.bz2 gentoo-2-56d29b362676362d932d5f93613e8341298cd759.zip | |
Fix building with GLIBC 2.12.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/btrfs-progs')
| -rw-r--r-- | sys-fs/btrfs-progs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild | 6 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch | 17 |
3 files changed, 26 insertions, 3 deletions
diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog index 68199afe23d4..91a480156476 100644 --- a/sys-fs/btrfs-progs/ChangeLog +++ b/sys-fs/btrfs-progs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/btrfs-progs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.28 2010/07/09 15:39:56 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.29 2010/08/11 14:04:23 ssuominen Exp $ + + 11 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + btrfs-progs-0.19.ebuild, +files/btrfs-progs-0.19-glibc212.patch: + Fix building with GLIBC 2.12. 09 Jul 2010; Pacho Ramos <pacho@gentoo.org> btrfs-progs-0.19.ebuild: stable amd64, bug 327333 diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild index 9f843a272d24..eedc17256233 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild,v 1.4 2010/07/09 15:39:56 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild,v 1.5 2010/08/11 14:04:23 ssuominen Exp $ inherit eutils @@ -27,7 +27,9 @@ src_unpack() { # Remove code that updates the total used space, since # btrfs_update_block_group does that work now. # (patch that did not make 0.19 release) - epatch "${FILESDIR}/${P}-convert-remove-used-space-update.patch" + epatch "${FILESDIR}"/${P}-convert-remove-used-space-update.patch + + epatch "${FILESDIR}"/${P}-glibc212.patch # Fix hardcoded "gcc" and "make" sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch new file mode 100644 index 000000000000..183fe2af3ea3 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch @@ -0,0 +1,17 @@ +btrfsck.o: In function `maybe_free_inode_rec': +btrfsck.c:(.text+0xce6): undefined reference to `S_ISDIR' +btrfsck.c:(.text+0xd13): undefined reference to `S_ISREG' +btrfsck.c:(.text+0xdc7): undefined reference to `S_ISREG' +btrfsck.c:(.text+0xe2e): undefined reference to `S_ISLNK' +btrfsck.c:(.text+0xe5b): undefined reference to `S_ISLNK' + +--- btrfsck.c ++++ btrfsck.c +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <fcntl.h> ++#include <sys/stat.h> + #include "kerncompat.h" + #include "ctree.h" + #include "disk-io.h" |