|
Line
Link Here
|
| 0 |
-- a/e2fsprogs-1.42.6.ebuild |
0 |
++ b/e2fsprogs-1.42.6.ebuild |
|
Lines 18-24
Link Here
|
| 18 |
LICENSE="GPL-2 BSD" |
18 |
LICENSE="GPL-2 BSD" |
| 19 |
SLOT="0" |
19 |
SLOT="0" |
| 20 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" |
20 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" |
| 21 |
IUSE="nls static-libs elibc_FreeBSD" |
21 |
IUSE="nls static-libs static elibc_FreeBSD" |
| 22 |
|
22 |
|
| 23 |
RDEPEND="~sys-libs/${PN}-libs-${PV} |
23 |
RDEPEND="~sys-libs/${PN}-libs-${PV} |
| 24 |
>=sys-apps/util-linux-2.16 |
24 |
>=sys-apps/util-linux-2.16 |
|
Lines 42-47
Link Here
|
| 42 |
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
42 |
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
| 43 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
43 |
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch |
| 44 |
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch |
44 |
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch |
|
|
45 |
epatch "${FILESDIR}"/${P}-static-progs.patch |
| 45 |
if [[ ${CHOST} == *-mint* ]] ; then |
46 |
if [[ ${CHOST} == *-mint* ]] ; then |
| 46 |
epatch "${FILESDIR}"/${PN}-1.41-mint.patch |
47 |
epatch "${FILESDIR}"/${PN}-1.41-mint.patch |
| 47 |
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch |
48 |
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch |
|
Lines 51-57
Link Here
|
| 51 |
sed -i -r \ |
52 |
sed -i -r \ |
| 52 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
53 |
-e 's:@LIBINTL@:@LTLIBINTL@:' \ |
| 53 |
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ |
54 |
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ |
| 54 |
-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \ |
55 |
-e '/^DEP(|STATIC_)LIB(COM_ERR|SS)/s:=.*:=:' \ |
|
|
56 |
-e '/^STATIC_LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@STATIC_LIB_EXT@:-l\1:' \ |
| 55 |
MCONFIG.in || die "muck libs" #122368 |
57 |
MCONFIG.in || die "muck libs" #122368 |
| 56 |
sed -i -r \ |
58 |
sed -i -r \ |
| 57 |
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
59 |
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
|
Lines 89-95
Link Here
|
| 89 |
--disable-libuuid \ |
91 |
--disable-libuuid \ |
| 90 |
--disable-quota \ |
92 |
--disable-quota \ |
| 91 |
--disable-fsck \ |
93 |
--disable-fsck \ |
| 92 |
--disable-uuidd |
94 |
--disable-uuidd \ |
|
|
95 |
$(use_enable static static-progs) |
| 93 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
96 |
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
| 94 |
eerror "INTL sanity check failed, aborting build." |
97 |
eerror "INTL sanity check failed, aborting build." |
| 95 |
eerror "Please post your ${S}/config.log file as an" |
98 |
eerror "Please post your ${S}/config.log file as an" |
