summaryrefslogtreecommitdiff
path: root/meta/recipes-support/attr
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-10-09 12:41:39 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-09 14:44:07 +0100
commit1d7c9a9828747f6d58b141af685633d69f896baa (patch)
tree51dc6ae769f6e8405d3b88b87e590760d082ba38 /meta/recipes-support/attr
parentc805a6ed281279ef0ccc4e6e084d52a725260e09 (diff)
downloadopenembedded-core-1d7c9a9828747f6d58b141af685633d69f896baa.tar.gz
openembedded-core-1d7c9a9828747f6d58b141af685633d69f896baa.tar.bz2
openembedded-core-1d7c9a9828747f6d58b141af685633d69f896baa.tar.xz
openembedded-core-1d7c9a9828747f6d58b141af685633d69f896baa.zip
attr: fix the hardcoded search path in the AC_PATH_PROG
We should respect $PATH. The patch is from Qing. Fixes [BUGID #369]. BTW: the bug was triggered on a build host that didn't install gettext. Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/recipes-support/attr')
-rw-r--r--meta/recipes-support/attr/ea-acl.inc3
-rw-r--r--meta/recipes-support/attr/files/no-fixed-prog-path.patch99
2 files changed, 101 insertions, 1 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 77fa2b4fd..bc93107ac 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -2,7 +2,8 @@
DEPENDS =+ "gettext"
-SRC_URI += "file://relative-libdir.patch;striplevel=0"
+SRC_URI += "file://relative-libdir.patch;striplevel=0 \
+ file://no-fixed-prog-path.patch"
inherit autotools
diff --git a/meta/recipes-support/attr/files/no-fixed-prog-path.patch b/meta/recipes-support/attr/files/no-fixed-prog-path.patch
new file mode 100644
index 000000000..88d9c0e0d
--- /dev/null
+++ b/meta/recipes-support/attr/files/no-fixed-prog-path.patch
@@ -0,0 +1,99 @@
+Not using fixed utility path, but respect $PATH
+
+10/09/2010 - created by Qing He <qing.he@intel.com>
+
+diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
+index 165db35..0afe578 100644
+--- a/m4/package_utilies.m4
++++ b/m4/package_utilies.m4
+@@ -37,22 +37,22 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+ AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
+
+ if test -z "$MAKE"; then
+- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
++ AC_PATH_PROG(MAKE, gmake)
+ fi
+ if test -z "$MAKE"; then
+- AC_PATH_PROG(MAKE, make,, /usr/bin)
++ AC_PATH_PROG(MAKE, make)
+ fi
+ make=$MAKE
+ AC_SUBST(make)
+ AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
+
+ if test -z "$TAR"; then
+- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
++ AC_PATH_PROG(TAR, tar)
+ fi
+ tar=$TAR
+ AC_SUBST(tar)
+ if test -z "$ZIP"; then
+- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
++ AC_PATH_PROG(ZIP, gzip)
+ fi
+
+ zip=$ZIP
+@@ -65,25 +65,25 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+ AC_SUBST(makedepend)
+
+ if test -z "$AWK"; then
+- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
++ AC_PATH_PROG(AWK, awk)
+ fi
+ awk=$AWK
+ AC_SUBST(awk)
+
+ if test -z "$SED"; then
+- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
++ AC_PATH_PROG(SED, sed)
+ fi
+ sed=$SED
+ AC_SUBST(sed)
+
+ if test -z "$ECHO"; then
+- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
++ AC_PATH_PROG(ECHO, echo)
+ fi
+ echo=$ECHO
+ AC_SUBST(echo)
+
+ if test -z "$SORT"; then
+- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
++ AC_PATH_PROG(SORT, sort)
+ fi
+ sort=$SORT
+ AC_SUBST(sort)
+@@ -93,21 +93,21 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+
+ if test "$enable_gettext" = yes; then
+ if test -z "$MSGFMT"; then
+- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
++ AC_PATH_PROG(MSGFMT, msgfmt)
+ fi
+ msgfmt=$MSGFMT
+ AC_SUBST(msgfmt)
+ AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
+
+ if test -z "$MSGMERGE"; then
+- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
++ AC_PATH_PROG(MSGMERGE, msgmerge)
+ fi
+ msgmerge=$MSGMERGE
+ AC_SUBST(msgmerge)
+ AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
+
+ if test -z "$XGETTEXT"; then
+- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
++ AC_PATH_PROG(XGETTEXT, xgettext)
+ fi
+ xgettext=$XGETTEXT
+ AC_SUBST(xgettext)
+@@ -117,7 +117,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+ fi
+
+ if test -z "$RPM"; then
+- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
++ AC_PATH_PROG(RPM, rpm)
+ fi
+ rpm=$RPM
+ AC_SUBST(rpm)