summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-11-30 20:56:47 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-11-30 20:56:47 +0000
commit00a5e8de5a0fe2c557405145a13190bbb97e365c (patch)
tree0c09aa891c0a56d71001c2a15f7c9af88fadc959
parent0c6d751fa0a6f58eb2c523753806aa4bbe118746 (diff)
e2fsprogs-1.38: Always --disable-nls for linux-uclibc.
-rw-r--r--packages/e2fsprogs/e2fsprogs-native_1.38.bb2
-rw-r--r--packages/e2fsprogs/e2fsprogs.inc3
-rw-r--r--packages/e2fsprogs/e2fsprogs_1.38.bb4
3 files changed, 6 insertions, 3 deletions
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