diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-11 16:45:30 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-11 16:45:30 +0000 |
| commit | 4a09937401ae9598a1f66ebf2f022ae799d62700 (patch) | |
| tree | da4aad3a51b1b45a504aa0f77546e518f1624e5e /sys-fs | |
| parent | Added modular X dependencies (bug #120934, Herve Roussain). (diff) | |
| download | gentoo-2-4a09937401ae9598a1f66ebf2f022ae799d62700.tar.gz gentoo-2-4a09937401ae9598a1f66ebf2f022ae799d62700.tar.bz2 gentoo-2-4a09937401ae9598a1f66ebf2f022ae799d62700.zip | |
Add patch to fix libintl linkage on non-glibc systems. Bug #122368.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.38-libintl.patch | 13 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index b127692444c2..8bd77df638f9 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.78 2006/02/08 01:17:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.79 2006/02/11 16:45:30 flameeyes Exp $ + + 11 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/e2fsprogs-1.38-libintl.patch, e2fsprogs-1.38-r1.ebuild: + Add patch to fix libintl linkage on non-glibc systems. Bug #122368. 08 Feb 2006; Mike Frysinger <vapier@gentoo.org> +files/e2fsprogs-1.38-tests-locale.patch, e2fsprogs-1.38-r1.ebuild: diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild index e476e122c539..b48554f3dcd2 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild,v 1.3 2006/02/08 01:17:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild,v 1.4 2006/02/11 16:45:30 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -14,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="nls static" RDEPEND="~sys-libs/com_err-${PV} - ~sys-libs/ss-${PV}" + ~sys-libs/ss-${PV} + nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) sys-apps/texinfo" @@ -37,6 +38,9 @@ src_unpack() { epatch "${FILESDIR}"/${P}-blkid-swsuspend.patch epatch "${FILESDIR}"/${P}-vfat-labels.patch + # Fixes libintl handling on non-glibc #122368 + epatch "${FILESDIR}/${P}-libintl.patch" + # 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' \ diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.38-libintl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-libintl.patch new file mode 100644 index 000000000000..af526b1c8f5a --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-libintl.patch @@ -0,0 +1,13 @@ +Index: e2fsprogs-1.38/MCONFIG.in +=================================================================== +--- e2fsprogs-1.38.orig/MCONFIG.in ++++ e2fsprogs-1.38/MCONFIG.in +@@ -71,7 +71,7 @@ LIBE2P = $(LIB)/libe2p@LIB_EXT@ + LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ + LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ + LIBBLKID = $(LIB)/libblkid@LIB_EXT@ +-LIBINTL = @LIBINTL@ ++LIBINTL = @LTLIBINTL@ + DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ + + STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ |