| 1 |
uberlord 07/09/15 08:54:26 |
| 2 |
|
| 3 |
Modified: ChangeLog e2fsprogs-1.40.2.ebuild |
| 4 |
Log: |
| 5 |
Add the fsck_ext2fs helper and man page for FreeBSD and add a patch for 1.40.2 to work on FreeBSD. |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.111 sys-fs/e2fsprogs/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.111&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.111&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.110&r2=1.111 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v |
| 18 |
retrieving revision 1.110 |
| 19 |
retrieving revision 1.111 |
| 20 |
diff -u -r1.110 -r1.111 |
| 21 |
--- ChangeLog 14 Jul 2007 17:19:03 -0000 1.110 |
| 22 |
+++ ChangeLog 15 Sep 2007 08:54:25 -0000 1.111 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for sys-fs/e2fsprogs |
| 25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.110 2007/07/14 17:19:03 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.111 2007/09/15 08:54:25 uberlord Exp $ |
| 28 |
+ |
| 29 |
+ 15 Sep 2007; Roy Marples <uberlord@g.o> +files/fsck_ext2fs.8, |
| 30 |
+ +files/e2fsprogs-1.40-fbsd.patch, +files/fsck_ext2fs.c, |
| 31 |
+ e2fsprogs-1.40.2.ebuild: |
| 32 |
+ Add the fsck_ext2fs helper and man page for FreeBSD and add a patch for |
| 33 |
+ 1.40.2 to work on FreeBSD. |
| 34 |
|
| 35 |
*e2fsprogs-1.40.2 (14 Jul 2007) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: e2fsprogs-1.40.2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- e2fsprogs-1.40.2.ebuild 14 Jul 2007 17:19:03 -0000 1.1 |
| 53 |
+++ e2fsprogs-1.40.2.ebuild 15 Sep 2007 08:54:25 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2007 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild,v 1.1 2007/07/14 17:19:03 vapier Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.2.ebuild,v 1.2 2007/09/15 08:54:25 uberlord Exp $ |
| 59 |
|
| 60 |
inherit eutils flag-o-matic toolchain-funcs |
| 61 |
|
| 62 |
@@ -10,7 +10,7 @@ |
| 63 |
|
| 64 |
LICENSE="GPL-2 BSD" |
| 65 |
SLOT="0" |
| 66 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 67 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 68 |
IUSE="nls static" |
| 69 |
|
| 70 |
RDEPEND="~sys-libs/com_err-${PV} |
| 71 |
@@ -31,6 +31,9 @@ |
| 72 |
epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch |
| 73 |
epatch "${FILESDIR}"/${PN}-1.40-libintl.patch #122368 |
| 74 |
|
| 75 |
+ # Fix compile on FreeBSD |
| 76 |
+ epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
| 77 |
+ |
| 78 |
# kernel headers use the same defines as e2fsprogs and can cause issues #48829 |
| 79 |
sed -i \ |
| 80 |
-e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \ |
| 81 |
@@ -58,9 +61,9 @@ |
| 82 |
|
| 83 |
src_compile() { |
| 84 |
# Keep the package from doing silly things |
| 85 |
- export LDCONFIG=/bin/true |
| 86 |
+ export LDCONFIG=: |
| 87 |
export CC=$(tc-getCC) |
| 88 |
- export STRIP=/bin/true |
| 89 |
+ export STRIP=: |
| 90 |
|
| 91 |
econf \ |
| 92 |
--bindir=/bin \ |
| 93 |
@@ -80,6 +83,11 @@ |
| 94 |
fi |
| 95 |
# Parallel make sometimes fails |
| 96 |
emake -j1 COMPILE_ET=compile_et || die |
| 97 |
+ |
| 98 |
+ # Build the FreeBSD helper |
| 99 |
+ if use elibc_FreeBSD ; then |
| 100 |
+ ${CC} "${FILESDIR}"/fsck_ext2fs.c -o fsck_ext2fs || die |
| 101 |
+ fi |
| 102 |
} |
| 103 |
|
| 104 |
src_install() { |
| 105 |
@@ -104,8 +112,17 @@ |
| 106 |
dosbin "${D}"/sbin/mklost+found |
| 107 |
rm -f "${D}"/sbin/mklost+found |
| 108 |
|
| 109 |
- # these manpages are already provided by FreeBSD libc |
| 110 |
- use elibc_FreeBSD && \ |
| 111 |
- rm -f "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ |
| 112 |
+ if use elibc_FreeBSD ; then |
| 113 |
+ # Install helpers for us |
| 114 |
+ dosbin "${S}"/fsck_ext2fs |
| 115 |
+ doman "${FILESDIR}"/fsck_ext2fs.8 |
| 116 |
+ |
| 117 |
+ # these manpages are already provided by FreeBSD libc |
| 118 |
+ # and filefrag is linux only |
| 119 |
+ rm -f \ |
| 120 |
+ "${D}"/sbin/filefrag |
| 121 |
+ "${D}"/usr/share/man/man8/filefrag.8 |
| 122 |
+ "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ |
| 123 |
"${D}"/usr/share/man/man1/uuidgen.1 |
| 124 |
+ fi |
| 125 |
} |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
-- |
| 130 |
gentoo-commits@g.o mailing list |
Archives