summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
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
parentc805a6ed281279ef0ccc4e6e084d52a725260e09 (diff)
downloadpoky-1d7c9a9828747f6d58b141af685633d69f896baa.tar.gz
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')
-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 77fa2b4fd6..bc93107ac0 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -2,7 +2,8 @@
2 2
3DEPENDS =+ "gettext" 3DEPENDS =+ "gettext"
4 4
5SRC_URI += "file://relative-libdir.patch;striplevel=0" 5SRC_URI += "file://relative-libdir.patch;striplevel=0 \
6 file://no-fixed-prog-path.patch"
6 7
7inherit autotools 8inherit autotools
8 9
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 0000000000..88d9c0e0de
--- /dev/null
+++ b/meta/recipes-support/attr/files/no-fixed-prog-path.patch
@@ -0,0 +1,99 @@
1Not using fixed utility path, but respect $PATH
2
310/09/2010 - created by Qing He <qing.he@intel.com>
4
5diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
6index 165db35..0afe578 100644
7--- a/m4/package_utilies.m4
8+++ b/m4/package_utilies.m4
9@@ -37,22 +37,22 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
10 AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
11
12 if test -z "$MAKE"; then
13- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
14+ AC_PATH_PROG(MAKE, gmake)
15 fi
16 if test -z "$MAKE"; then
17- AC_PATH_PROG(MAKE, make,, /usr/bin)
18+ AC_PATH_PROG(MAKE, make)
19 fi
20 make=$MAKE
21 AC_SUBST(make)
22 AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
23
24 if test -z "$TAR"; then
25- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
26+ AC_PATH_PROG(TAR, tar)
27 fi
28 tar=$TAR
29 AC_SUBST(tar)
30 if test -z "$ZIP"; then
31- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
32+ AC_PATH_PROG(ZIP, gzip)
33 fi
34
35 zip=$ZIP
36@@ -65,25 +65,25 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
37 AC_SUBST(makedepend)
38
39 if test -z "$AWK"; then
40- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
41+ AC_PATH_PROG(AWK, awk)
42 fi
43 awk=$AWK
44 AC_SUBST(awk)
45
46 if test -z "$SED"; then
47- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
48+ AC_PATH_PROG(SED, sed)
49 fi
50 sed=$SED
51 AC_SUBST(sed)
52
53 if test -z "$ECHO"; then
54- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
55+ AC_PATH_PROG(ECHO, echo)
56 fi
57 echo=$ECHO
58 AC_SUBST(echo)
59
60 if test -z "$SORT"; then
61- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
62+ AC_PATH_PROG(SORT, sort)
63 fi
64 sort=$SORT
65 AC_SUBST(sort)
66@@ -93,21 +93,21 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
67
68 if test "$enable_gettext" = yes; then
69 if test -z "$MSGFMT"; then
70- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
71+ AC_PATH_PROG(MSGFMT, msgfmt)
72 fi
73 msgfmt=$MSGFMT
74 AC_SUBST(msgfmt)
75 AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
76
77 if test -z "$MSGMERGE"; then
78- AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
79+ AC_PATH_PROG(MSGMERGE, msgmerge)
80 fi
81 msgmerge=$MSGMERGE
82 AC_SUBST(msgmerge)
83 AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
84
85 if test -z "$XGETTEXT"; then
86- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
87+ AC_PATH_PROG(XGETTEXT, xgettext)
88 fi
89 xgettext=$XGETTEXT
90 AC_SUBST(xgettext)
91@@ -117,7 +117,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
92 fi
93
94 if test -z "$RPM"; then
95- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
96+ AC_PATH_PROG(RPM, rpm)
97 fi
98 rpm=$RPM
99 AC_SUBST(rpm)