From: Roy.Li <rongqing.li@windriver.com>
Date: Wed, 25 Jul 2012 08:07:39 +0000 (+0800)
Subject: findutils: fix sort dir on updatedb
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd1a3064e9b90b8791a66dabea372c05340e54ee;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

findutils: fix sort dir on updatedb

[YOCTO #2826]

m4/nullsort.m4 tries to find sort dir, and write it to updatedb,
but nullsort.m4 is checking the host dir. Once the sort dirs on
target and host are different, updatedb will fail due to wrong
sort dir.

Since we always have sort under ${bindir}, so we can assign it
directly.

(From OE-Core rev: 05c3c327370971eaa9d872a88782278126030229)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index 127eb4b1881..218bf834435 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -1,6 +1,6 @@
 require findutils.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://01-27017.patch \
             file://02-28824.patch \
@@ -15,4 +15,6 @@ SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
 # http://savannah.gnu.org/bugs/?27299
 CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
 
+EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
+
 BBCLASSEXTEND = "native"