diff options
| -rw-r--r-- | sys-fs/btrfs-progs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/Manifest | 15 | ||||
| -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 |
4 files changed, 29 insertions, 15 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/Manifest b/sys-fs/btrfs-progs/Manifest index fa35ca500d28..67841de29648 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,7 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX btrfs-progs-0.19-convert-remove-used-space-update.patch 1005 RMD160 52925f470e96f851f74862fa0ac9cf7bc729c536 SHA1 49636f68528d1faacc0d8a72be63862e4e3a672c SHA256 75759924f7d766705c5ea97d4cc2d70962b4c49e7f274465c3c2e9021d481f38 +AUX btrfs-progs-0.19-glibc212.patch 535 RMD160 c7d444ec10ac7e30a8eb5645ffae1be53881f96a SHA1 eb5167b9c03c3052ca7516e0a427fba3a4b65ba0 SHA256 c9a1479df01ba8b74b97ecf723d7f2a5e7c347dc0c92ae6676b9d1dc311a6bd1 DIST btrfs-progs-0.16.tar.bz2 97344 RMD160 c2d3e1ec0eccafd381336841d5129f1c380c88df SHA1 506a0290553099a0b8694d69d41e63fbe0394835 SHA256 a0b7b2827db66f91be15afa497038fa13df55774ad77d6ab793d3c97d2c5dc4c DIST btrfs-progs-0.17.tar.bz2 110438 RMD160 7c1737e7315cdf1180080f52ed70a7739b7f9940 SHA1 cd247f4c09a17e97039aa69978921c848b08d621 SHA256 f5bc36fe394571721a3470eeef7ee462cfbea6b83ed2ecaa1da0e58d9f537a2a DIST btrfs-progs-0.18.tar.bz2 110410 RMD160 d86484c4a86f57189dbf77cadd694d2bfcb763a8 SHA1 c049943d7a31f63432b19c1eb5fbde119f4bf0bb SHA256 e81f483560eb93b99f33e20aa035e968d7e5b0894543b448cff6da983d4d4f0c @@ -9,14 +7,7 @@ DIST btrfs-progs-0.19.tar.bz2 118119 RMD160 28e7955fd1f9e0ac68c465cf3bbeec3c889b EBUILD btrfs-progs-0.16-r1.ebuild 1642 RMD160 bf0049169e363af8290b26a6a59cff8a179f802e SHA1 23fb5ba116c70fdcd35406eb1fa7029ad4aa2ea7 SHA256 f51ad6e3873277f6381f8d76776d6a94f7f22b26fef9115f6b730867e924eb96 EBUILD btrfs-progs-0.17.ebuild 1678 RMD160 4ab6fbe77a92c37de9ff5694f769712841036eb6 SHA1 ddd4613a4b198d20b35313dbea344dda405ea1f4 SHA256 d4fb9c479809410086c22ab65ea47333c33e2a7a120105c597cff8df55f699b1 EBUILD btrfs-progs-0.18-r1.ebuild 2164 RMD160 c81024daf29fe8d5d51827caf37d7d49acd61dd7 SHA1 a28063966f6b46b8a3434246985b1172f6dd8678 SHA256 a26122b1291e6fe5c78348c8480d07cc61f3d3f4fbe0fd02513d1f027325fa53 -EBUILD btrfs-progs-0.19.ebuild 2437 RMD160 9f815e55238d018c8dcddd8d5cc385b4337f91bc SHA1 7db560b16f0444da121c95d4d482872864ee5060 SHA256 6e992edc99140e95135e4523eefe1b1256fad9f0e6708c8b7b9ff84745e854c3 +EBUILD btrfs-progs-0.19.ebuild 2484 RMD160 a02e9798f474e0745afbbf0708cb2e4c989b996a SHA1 cf7cf21f8f6edb9eb0b6a5077c384e20f29b4524 SHA256 feb8194703f575c7a7cd2c1b5532b2abb5fa9fdce8dd9267e2568d009c5a4224 EBUILD btrfs-progs-9999.ebuild 2153 RMD160 585350c8c755b977eccefb77a01f673a320c3454 SHA1 c81099ee5e230e1433848a709c5cba2c06df460a SHA256 133c723f9c3e5435a01f9ffcb6a2312d05c1624106337c7d9cacc44fa14f976a -MISC ChangeLog 4655 RMD160 d92c1f9e504085598f48ddb55bfa6b9c84ff9cbb SHA1 8fbd57d2e30990c59082bcf4900df9344aff0596 SHA256 2d49b74d438f1908e075e686d40f6115b0cecbcdfce869544581ff04fa6d472b +MISC ChangeLog 4813 RMD160 89de7f4e4593b2abca266109d12e5f976994ec5d SHA1 893d813f861572031da43a60e7615d3737de1d84 SHA256 2aff6d4c9508e0be2153e9208e756cb488cdd0a584d183c2a981eff9587e8275 MISC metadata.xml 321 RMD160 52634dbd80c8f5b68acf4c2587ffc9525885038b SHA1 50409407adeeacc078c93a4dfd9ae90033506209 SHA256 c2a766f3953ae00375ef6960f803cf2bb661e56afb2c99dda89a92cb6418d012 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkw3QtMACgkQCaWpQKGI+9RaAwCfTTsisSwMkyu08+4f6BorZlNq -NL0An1Ur0JBDd+lH0vjk50rjql7Oy+E+ -=udsA ------END PGP SIGNATURE----- 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" |