autotools.bbclass: Replace "grep ... >/dev/null" with "grep -q"
For aesthetic style reasons, use "grep -q" instead of ">/dev/null". (From OE-Core rev: 39a7bfde92211b3546ff0a8e6a3e549714996b28) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7ddcbc5eca
commit
6b210e74b7
|
@ -193,14 +193,14 @@ autotools_do_configure() {
|
||||||
else
|
else
|
||||||
CONFIGURE_AC=configure.ac
|
CONFIGURE_AC=configure.ac
|
||||||
fi
|
fi
|
||||||
if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
|
if grep -q "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC; then
|
||||||
if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
|
if grep -q "sed.*POTFILES" $CONFIGURE_AC; then
|
||||||
: do nothing -- we still have an old unmodified configure.ac
|
: do nothing -- we still have an old unmodified configure.ac
|
||||||
else
|
else
|
||||||
bbnote Executing glib-gettextize --force --copy
|
bbnote Executing glib-gettextize --force --copy
|
||||||
echo "no" | glib-gettextize --force --copy
|
echo "no" | glib-gettextize --force --copy
|
||||||
fi
|
fi
|
||||||
elif grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
|
elif grep -q "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC; then
|
||||||
# We'd call gettextize here if it wasn't so broken...
|
# We'd call gettextize here if it wasn't so broken...
|
||||||
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
|
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
|
||||||
if [ -d ${S}/po/ ]; then
|
if [ -d ${S}/po/ ]; then
|
||||||
|
@ -212,7 +212,7 @@ autotools_do_configure() {
|
||||||
PRUNE_M4="$PRUNE_M4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4"
|
PRUNE_M4="$PRUNE_M4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4"
|
||||||
fi
|
fi
|
||||||
mkdir -p m4
|
mkdir -p m4
|
||||||
if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
|
if grep -q "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC; then
|
||||||
if ! echo "${DEPENDS}" | grep -q intltool-native; then
|
if ! echo "${DEPENDS}" | grep -q intltool-native; then
|
||||||
bbwarn "Missing DEPENDS on intltool-native"
|
bbwarn "Missing DEPENDS on intltool-native"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue