Skip to contentSkip to conversation

espeak: Use SITEINFO_ENDIANESS instead of SITEINFO_ENDIANNESS

PATCH In review Khem Raj 2 participants 4 messages Jul 26, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 espeak: Use SITEINFO_ENDIANESS instead of SITEINFO_ENDIANNESS

This spelling difference existed when siteinfo was in two places

---
 meta-oe/recipes-support/espeak/espeak_1.37.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
meta-oe/recipes-support/espeak/espeak_1.37.bb +4 -2
index 6cc4cd4..5f9fcc1 100644
@@ -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
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH 2/2 openssl: Use SITEINFO_ENDIANESS instead of SITEINFO_ENDIANNESS

This spelling difference existed when siteinfo was in two places

---
 meta-oe/recipes-connectivity/openssl/openssl.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-connectivity/openssl/openssl.inc +2 -2
index 86b29f0..082fb7b 100644
@@ -11,10 +11,10 @@ S = "${WORKDIR}/openssl-${PV}"
 
 inherit siteinfo
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 AR_append = " r"
-CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
 	-DTERMIO ${FULL_OPTIMIZATION} -Wall"
 
 # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
Signature · 1 line
1.7.4.1
#2 lore raw
In reply to Khem Raj

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 06:06, Khem Raj schreef:

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

Quoted 7 lines

This spelling difference existed when siteinfo was in two places

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 renamed from meta-oe/recipes-support/espeak/espeak_1.37.bb +0 -1
 
-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-----

author
#3 lore raw
Quoted 6 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 06:06, Khem Raj schreef:

Quoted 2 lines

This spelling difference existed when siteinfo was in two places

Quoted 7 lines

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

Quoted 5 lines
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 renamed from meta-oe/recipes-support/espeak/espeak_1.37.bb +0 -1
 
-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.