[oe-commits] Khem Raj : classes/autotools.bbclass: Dont bail out if gettext/config. rpath does not exist.

git version control git at git.openembedded.org
Sat Jun 5 13:53:39 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 87bf42f132f6a05fd294e3690cf637ab5b1362a6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=87bf42f132f6a05fd294e3690cf637ab5b1362a6

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Jun  2 12:40:36 2010 -0700

classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist.

* Add a note if this file does not exist. The reason is that gettext can
  needs libiconv and libiconv needs gettext so we need to solve this
  catch 22

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 classes/autotools.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index df2c114..8a5b982 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -125,7 +125,11 @@ autotools_do_configure() {
 			    echo "no" | glib-gettextize --force --copy
 			  fi
 			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-			  cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+			  if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then
+			    cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+			  else
+			    oenote ${STAGING_DATADIR}/gettext/config.rpath not found. gettext is not installed.
+			  fi
 			fi
 
 			fi





More information about the Openembedded-commits mailing list