Valentin Popa : icu: upgrade to 53.1

oe-commits Martin Jansa 1 participant 1 message Jul 16, 2014 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Jansa

author

2014-07-16 15:41 UTC #1 lore raw

Quoted 10 lines · On Sun, May 11, 2014 at 11:28:16AM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: cce150502fada2068ef1ab92b88a08ed0b64d766
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cce150502fada2068ef1ab92b88a08ed0b64d766

Author: Valentin Popa <[email protected]>
Date:   Tue May  6 17:25:04 2014 +0300

icu: upgrade to 53.1

Quoted 8 lines

Removed patches:
(*) add_buffer_length_check_to_UTF_16_or_32_detector.patch
- not needed anymore
License is the same. BSD-like copyright inserted for lao-dictionary.
Signed-off-by Valentin Popa <[email protected]>
Signed-off-by Saul Wold <[email protected]>

Someone else seeing ICEs when thumb is enabled since this upgrade?

armv5te
| /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c:
In function 'ubidi_writeReordered_53':
| /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c:643:1:
internal compiler error: in patch_jump_insn, at cfgrtl.c:1275

|  }
|  ^
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| *** Failed compilation command follows:

----------------------------------------------------------
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork
-mtune=xscale --sysroot=/OE/build/shr-core/tmp-eglibc/sysroots/spitz
-D_REENTRANT -DU_HAVE_ELF_H=1 -DU_HAVE_ATOMIC=1 -I/OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common -DDEFAULT_ICU_PLUGINS="/usr/lib/icu" -DU_ATTRIBUTE_DEPRECATED= -DU_COMMON_IMPLEMENTATION -O2 -pipe -g -feliminate-unused-debug-types
-std=c99 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes
-Wwrite-strings -c -DPIC -fPIC -o ubidiwrt.o /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c | --- ( rebuild with "make VERBOSE=1 all" to show all parameters )
--------
| /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/config/mh-linux:44:
recipe for target 'ubidiwrt.o' failed
| make[1]: *** [ubidiwrt.o] Error 1

armv4t:
ERROR: Function failed: do_compile (log file is located at /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570)
ERROR: Logfile of failure stored in: /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570 Log data follows:

| DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common']
| DEBUG: Executing shell function do_compile
| NOTE: make
| Note: rebuild with "make VERBOSE=1 " to show all compiler parameters.
| make[0]: Making `all' in `stubdata'
| make[1]: Entering directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/stubdata'
| make[1]: Nothing to be done for 'all'.
| make[1]: Leaving directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/stubdata'
| make[0]: Making `all' in `common'
| make[1]: Entering directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/common'
|    arm-oe-linux-gnueabi-gcc    ...  /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c
| /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c: In function 'ubidi_writeReordered_53':
| /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c:643:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275
|  }
|  ^
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| *** Failed compilation command follows: ----------------------------------------------------------
| arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/build/shr-core/tmp-eglibc/sysroots/om-gta02 -D_REENTRANT -DU_HAVE_ELF_H=1 -DU_HAVE_ATOMIC=1 -I/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common -DDEFAULT_ICU_PLUGINS="/usr/lib/icu"  -DU_ATTRIBUTE_DEPRECATED= -DU_COMMON_IMPLEMENTATION -O2 -pipe -g -feliminate-unused-debug-types -std=c99 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -c -DPIC -fPIC -o ubidiwrt.o /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c
| --- ( rebuild with "make VERBOSE=1 all" to show all parameters ) --------
| /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/config/mh-linux:44: recipe for target 'ubidiwrt.o' failed
| make[1]: *** [ubidiwrt.o] Error 1
| make[1]: Leaving directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/common'
| Makefile:141: recipe for target 'all-recursive' failed
| make: *** [all-recursive] Error 2
| ERROR: oe_runmake failed
| WARNING: /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/run.do_compile.21570:1 exit 1 from
|   exit 1
| ERROR: Function failed: do_compile (log file is located at /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570)

NOTE: recipe icu-53.1-r0: task do_compile: Failed
ERROR: Task 6803 (/OE/build/shr-core/openembedded-core/meta/recipes-support/icu/icu_53.1.bb, do_compile) failed with exit code '1'
NOTE: recipe luajit-2.0.3-r0: task do_compile: Started
ERROR: Function failed: do_compile (log file is located at /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/luajit/2.0.3-r0/temp/log.do_compile.21586)
ERROR: Logfile of failure stored in: /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/luajit/2.0.3-r0/temp/log.do_compile.21586

Quoted 112 lines

---

 ...fer_length_check_to_UTF_16_or_32_detector.patch | 33 ----------------------
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |  0
 .../{icu-51.2 => icu}/icu-pkgdata-large-cmd.patch  |  0
 meta/recipes-support/icu/icu_51.2.bb               | 16 -----------
 meta/recipes-support/icu/icu_53.1.bb               | 21 ++++++++++++++
 5 files changed, 21 insertions(+), 49 deletions(-)

meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch deleted +0 ~~-33~~

deleted file mode 100644
index ad4d61c..0000000
@@ -1,33 +0,0 @@
---- source/i18n/csrucode.cpp
-+++ source/i18n/csrucode.cpp
-@@ -33,8 +33,9 @@ UBool CharsetRecog_UTF_16_BE::match(Inpu
- {
-     const uint8_t *input = textIn->fRawInput;
-     int32_t confidence = 0;
-+    int32_t length = textIn->fRawLength;
- 
--    if (input[0] == 0xFE && input[1] == 0xFF) {
-+    if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
-         confidence = 100;
-     }
- 
-@@ -57,8 +58,9 @@ UBool CharsetRecog_UTF_16_LE::match(Inpu
- {
-     const uint8_t *input = textIn->fRawInput;
-     int32_t confidence = 0;
-+    int32_t length = textIn->fRawLength;
- 
--    if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-+    if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-         confidence = 100;
-     }
- 
-@@ -81,7 +83,7 @@ UBool CharsetRecog_UTF_32::match(InputTe
-     bool hasBOM = FALSE;
-     int32_t confidence = 0;
- 
--    if (getChar(input, 0) == 0x0000FEFFUL) {
-+    if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
-         hasBOM = TRUE;
-     }
-

meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch renamed from meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch +0 -0

similarity index 100%
rename from meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
rename to meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch

meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch renamed from meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch +0 -0

similarity index 100%
rename from meta/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
rename to meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch

meta/recipes-support/icu/icu_51.2.bb deleted +0 ~~-16~~

deleted file mode 100644
index 2d1fd42..0000000
@@ -1,16 +0,0 @@
-require icu.inc
-
-LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
-
-
-BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
-SRC_URI = "${BASE_SRC_URI} \
-           file://icu-pkgdata-large-cmd.patch \
-           file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \
-          "
-
-SRC_URI_append_class-target = "\
-           file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
-          "
-SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
-SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"

meta/recipes-support/icu/icu_53.1.bb new file +21 -0

new file mode 100644
index 0000000..d93af68
@@ -0,0 +1,21 @@
+require icu.inc
+
+LIC_FILES_CHKSUM = "file://../license.html;md5=8b139ac5b93769623bd343318048238c"
+
+def icu_download_version(d):
+    pvsplit = d.getVar('PV', True).split('.')
+    return pvsplit[0] + "_" + pvsplit[1]
+
+ICU_PV = "${@icu_download_version(d)}"
+
+BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz"
+SRC_URI = "${BASE_SRC_URI} \
+           file://icu-pkgdata-large-cmd.patch \
+          "
+
+SRC_URI_append_class-target = "\
+           file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
+          "
+
+SRC_URI[md5sum] = "b73baa6fbdfef197608d1f69300919b9"
+SRC_URI[sha256sum] = "6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28"

Signature · 5 lines

-- 
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]