diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-04-27 03:36:47 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-27 03:36:47 +0000 |
commit | 8c97ed68fa85c35e2e3855ffaafd707ec9b508d3 (patch) | |
tree | 4a6b083ded19b4ceaf1f4041cc78fea9d776f2d1 /sys-fs | |
parent | Dont abort with long file names in archives #87540 by Jim Faulkner. (diff) | |
download | gentoo-2-8c97ed68fa85c35e2e3855ffaafd707ec9b508d3.tar.gz gentoo-2-8c97ed68fa85c35e2e3855ffaafd707ec9b508d3.tar.bz2 gentoo-2-8c97ed68fa85c35e2e3855ffaafd707ec9b508d3.zip |
Fix make check in e2p on an empty install #88570.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 7 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.37-e2p-test.patch | 11 |
4 files changed, 23 insertions, 3 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index fea24713f1c8..d571a714dd85 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.53 2005/03/24 03:59:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.54 2005/04/27 03:36:47 vapier Exp $ + + 27 Apr 2005; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.37-e2p-test.patch, e2fsprogs-1.37.ebuild, + e2fsprogs-1.37-r1.ebuild: + Fix make check in e2p on an empty install #88570. *e2fsprogs-1.37-r1 (24 Mar 2005) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild index 987fa335fbca..6a0916c54cff 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild,v 1.3 2005/04/07 17:36:18 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37-r1.ebuild,v 1.4 2005/04/27 03:36:47 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -30,6 +30,8 @@ src_unpack() { chmod u+w po/*.po # Userpriv fix #27348 # Clean up makefile to suck less epatch "${FILESDIR}"/e2fsprogs-1.36-makefile.patch + # Fix tests to work #88570 + epatch "${FILESDIR}"/e2fsprogs-1.37-e2p-test.patch # kernel headers use the same defines as e2fsprogs and can cause issues #48829 sed -i \ diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild index 69cdcc49f231..213d4fc27a50 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild,v 1.3 2005/03/22 23:55:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.37.ebuild,v 1.4 2005/04/27 03:36:47 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -29,6 +29,8 @@ src_unpack() { chmod u+w po/*.po # Userpriv fix #27348 # Clean up makefile to suck less epatch "${FILESDIR}"/e2fsprogs-1.36-makefile.patch + # Fix tests to work #88570 + epatch "${FILESDIR}"/e2fsprogs-1.37-e2p-test.patch # kernel headers use the same defines as e2fsprogs and can cause issues #48829 sed -i \ diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.37-e2p-test.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.37-e2p-test.patch new file mode 100644 index 000000000000..805f0162d53d --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.37-e2p-test.patch @@ -0,0 +1,11 @@ +--- e2fsprogs-1.37.orig/lib/e2p/Makefile.in 2005-04-26 23:13:44.000000000 -0400 ++++ e2fsprogs-1.37/lib/e2p/Makefile.in 2005-04-26 23:16:49.000000000 -0400 +@@ -66,7 +66,7 @@ + + tst_ostype: $(srcdir)/ostype.c + @echo " LD $@" +- @$(CC) -DTEST_PROGRAM -o tst_ostype $(srcdir)/ostype.c ++ @$(CC) -I.. -DTEST_PROGRAM -o tst_ostype $(srcdir)/ostype.c + + check:: tst_ostype + ./tst_ostype |