Patchwork [meta-oe,1/2] espeak: Use SITEINFO_ENDIANESS instead of SITEINFO_ENDIANNESS

login
register
mail settings
Submitter Khem Raj
Date July 26, 2011, 4:06 a.m.
Message ID <1311653193-29753-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/8495/
State New, archived
Headers show

Comments

Khem Raj - July 26, 2011, 4:06 a.m.
This spelling difference existed when siteinfo was in two places

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-support/espeak/espeak_1.37.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Koen Kooi - July 26, 2011, 4:57 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 06:06, Khem Raj schreef:
> This spelling difference existed when siteinfo was in two places
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta-oe/recipes-support/espeak/espeak_1.37.bb |    6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb index 6cc4cd4..5f9fcc1 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb @@ -1,12 +1,14 @@ require espeak.inc inherit siteinfo
> 
> -EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANNESS", "be",  "espeak-data (= ${PV})", "", d)}' +EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'

The double N is the right spelling, so the oe-core class should be fixed instead
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOLkk0MkyGM64RGpERAnRYAKCRBX66mOL2iKwLICDQZD+aBO7hlACeJwYs
1n6vb7pwzBfZUK/mG3v2r3c=
=XeWv
-----END PGP SIGNATURE-----
Khem Raj - July 26, 2011, 5:11 a.m.
On Mon, Jul 25, 2011 at 9:57 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 26-07-11 06:06, Khem Raj schreef:
>> This spelling difference existed when siteinfo was in two places
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta-oe/recipes-support/espeak/espeak_1.37.bb |    6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb index 6cc4cd4..5f9fcc1 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb @@ -1,12 +1,14 @@ require espeak.inc inherit siteinfo
>>
>> -EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANNESS", "be",  "espeak-data (= ${PV})", "", d)}' +EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'
>
> The double N is the right spelling, so the oe-core class should be fixed instead

I have sent patch for oe-core. I guess it will be less work to fix
oe-core than to chase
each and every layer to change the spelling.

Patch

diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb
index 6cc4cd4..5f9fcc1 100644
--- a/meta-oe/recipes-support/espeak/espeak_1.37.bb
+++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb
@@ -1,12 +1,14 @@ 
 require espeak.inc
 inherit siteinfo
 
-EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANNESS", "be",  "espeak-data (= ${PV})", "", d)}'
+EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'
 RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
 
 SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02"
 SRC_URI[sha256sum] = "77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3"
 
+PR = "r1"
+
 CXXFLAGS += "-DUSE_PORTAUDIO"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
@@ -33,7 +35,7 @@  do_install() {
         install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
         oe_libinstall -so -C src libespeak ${D}${libdir}
 
-	if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then
+	if [ "${SITEINFO_ENDIANESS}" = "be" ] ; then
 		# the big-endian phon* files are provided by the package espeak-data
 		rm -f ${S}/espeak-data/phon*
 	fi