From 481af4c81f80bf2e6c9ffc8df84b1a7f3d00dac8 Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Mon, 10 Mar 2008 19:09:06 +0000
Subject: e2fsprogs: Do not put --disable-nls twice into EXTRA_OECONF for
 uclibc.

---
 packages/e2fsprogs/e2fsprogs.inc     | 3 +--
 packages/e2fsprogs/e2fsprogs_1.38.bb | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'packages/e2fsprogs')

diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
index 7673d49e21..eb094470c4 100644
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,6 @@ S = "${WORKDIR}/e2fsprogs-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF += " --enable-dynamic-e2fsck"
+EXTRA_OECONF = "--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}"
 
 PARALLEL_MAKE = ""
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 91a391975f..a586c1ab10 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,13 +1,9 @@
 require e2fsprogs.inc
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
 
-EXTRA_OECONF += " --sbindir=${base_sbindir} \
-                  --disable-nls \
-                "
-
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
-- 
cgit v1.2.3