From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Fri, 30 Nov 2007 20:56:47 +0000 (+0000)
Subject: e2fsprogs-1.38: Always --disable-nls for linux-uclibc.
X-Git-Tag: Release-2010-05/1~8252^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a5e8de5a0fe2c557405145a13190bbb97e365c;p=openembedded.git

e2fsprogs-1.38: Always --disable-nls for linux-uclibc.
---

diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
index dcb5c412d0..e111ac9b61 100644
--- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -2,6 +2,8 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
+PR = "r1"
+
 EXTRA_OECONF = ""
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
index f209baf3b4..7673d49e21 100644
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -9,6 +9,7 @@ S = "${WORKDIR}/e2fsprogs-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = " --enable-dynamic-e2fsck"
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF += " --enable-dynamic-e2fsck"
 
 PARALLEL_MAKE = ""
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 282d338a5e..4f6f62bb12 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,10 +1,10 @@
 require e2fsprogs.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
 
-EXTRA_OECONF += " --sbindir=${base_sbindir} ${@base_conditional( "USE_NLS", "no", "--disable-nls", "", d )}"
+EXTRA_OECONF += " --sbindir=${base_sbindir}"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX