From: Chris Larson <clarson@kergoth.com>
Date: Tue, 16 Nov 2004 22:21:38 +0000 (+0000)
Subject: Ugh, unbork the uclibc builds with USE_NLS=no... it would attempt to copy the locale... 
X-Git-Tag: Release-2010-05/1~16200
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b861b7e61614c1fa45f16991b4d18dcb86a1df4;p=openembedded.git

Ugh, unbork the uclibc builds with USE_NLS=no... it would attempt to copy the locale tarball into its area, even though the tarball wasnt in SRC_URI.

BKrev: 419a7d72iP7a4vvByWcwwjEXVkn79A
---

diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index d9f41ab3e6..e1be6e9048 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -86,7 +86,7 @@ uclibcbuild_do_patch() {
 	ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
 	ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
 	
-	cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale
+	${@['cp %s/%s extra/locale' % (oe.data.getVar('WORKDIR', d, 1) or '', oe.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}
 }
 
 python do_patch () {
diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe
index 2e84583e70..306994bf19 100644
--- a/uclibc/uclibc_cvs.oe
+++ b/uclibc/uclibc_cvs.oe
@@ -89,7 +89,7 @@ uclibcbuild_do_patch() {
 	ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
 	ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
 	
-	cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale
+	${@['cp %s/%s extra/locale' % (oe.data.getVar('WORKDIR', d, 1) or '', oe.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}
 }
 
 python do_patch () {