diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-07 01:07:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-07 01:07:40 +0000 |
| commit | 83cbdd91655546c4a495803617763b240b62c273 (patch) | |
| tree | d19774e2d7c656872b0a0a5d14524ac99d550caf /sys-fs | |
| parent | Stable on alpha, bug 72113. (diff) | |
| download | historical-83cbdd91655546c4a495803617763b240b62c273.tar.gz historical-83cbdd91655546c4a495803617763b240b62c273.tar.bz2 historical-83cbdd91655546c4a495803617763b240b62c273.zip | |
Make sure kernel defines dont clash with internal defines #48829.
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/Manifest | 28 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild | 9 |
3 files changed, 26 insertions, 16 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 7d27856b06d2..67e3088c9fe1 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.41 2004/11/23 07:09:19 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.42 2004/12/07 01:07:40 vapier Exp $ + + 06 Dec 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild: + Make sure kernel defines dont clash with internal defines #48829. 23 Nov 2004; Bryan Ăstergaard <kloeri@gentoo.org> e2fsprogs-1.35-r1.ebuild: diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index f2ece56defd2..f17f88a1af46 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,24 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 bd17bdc3b4d73f1f1f48ba607d60556e ChangeLog 8860 -MD5 3a25e968d4e9df1c0942bbd5ecc54c5a e2fsprogs-1.35.ebuild 2821 +MD5 547bfaced2efa9950931cb1dc56746b9 ChangeLog 9005 +MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 2edb0d073060c192284a71d32d02adcc e2fsprogs-1.34-r1.ebuild 2884 -MD5 11f6d7ba53227f4104cf0c76fc29d554 e2fsprogs-1.34.ebuild 2768 -MD5 62c2a455f67313d325f2cf5cc6608a4c e2fsprogs-1.35-r1.ebuild 3197 -MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091 -MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989 -MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67 -MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67 -MD5 d9d69b54c577273521f4b8c2013a7a09 files/e2fsprogs-1.34-kernel-2.6-fix.patch 934 -MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67 +MD5 3a25e968d4e9df1c0942bbd5ecc54c5a e2fsprogs-1.35.ebuild 2821 +MD5 a24f30fe34e7bd8fbb68309a6f8ecd7a e2fsprogs-1.35-r1.ebuild 3466 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316 +MD5 d9d69b54c577273521f4b8c2013a7a09 files/e2fsprogs-1.34-kernel-2.6-fix.patch 934 +MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989 +MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34-r1 67 +MD5 b3b97c7ba36458e2842891e96e1ce0de files/e2fsprogs-1.34-swap-symlink.diff 1091 +MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35 67 +MD5 3d9735f2397680a4978124f6805219ae files/digest-e2fsprogs-1.35-r1 67 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBouJBugEuf3OQ0akRAjTrAKCG/RpaUzaAM1zhPbxUOWqoSSstIACfXYqN -iOcZ/91XmnbM4j2tbXosuJY= -=9/fF +iD8DBQFBtQJlroRuSHgZdywRAuLZAJ9vlydVBAHVpfuzIR0xjGtVoj9H8ACgkyb/ +vwI2Eb36z6k8yf+vC6Tc8hg= +=zAPY -----END PGP SIGNATURE----- diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild index e8842fa087ac..a54e5743f64e 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.11 2004/11/23 07:09:19 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.12 2004/12/07 01:07:40 vapier Exp $ inherit eutils flag-o-matic gnuconfig @@ -33,6 +33,13 @@ src_unpack() { # Use -fPIC compiled shared files in .a files. Fix kdelibs-3.3.0 compilation on hppa. use static || sed -e '/ARUPD/s:$(OBJS):elfshared/*.o:' -i ${S}/lib/Makefile.library + + # kernel headers use the same defines as e2fsprogs and can cause issues #48829 + sed -i \ + -e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \ + configure e2fsck/journal.c e2fsck/recovery.c \ + e2fsck/unix.c lib/ext2fs/kernel-jbd.h \ + || die "sed jbd debug failed" } src_compile() { |