Patchwork icu: update to upstream version 50.1.1

login
register
mail settings
Submitter Marko Lindqvist
Date Dec. 28, 2012, 2:44 a.m.
Message ID <1356662690-16034-2-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/41751/
State Accepted
Commit b03c4188c8372ae9156a9e6adc7cf66edc76dd16
Headers show

Comments

Marko Lindqvist - Dec. 28, 2012, 2:44 a.m.
This seems to fix HarfBuzz compile problems.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-support/icu/icu_50.1.1.bb |   11 +++++++++++
 meta/recipes-support/icu/icu_50.1.bb   |   11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 meta/recipes-support/icu/icu_50.1.1.bb
 delete mode 100644 meta/recipes-support/icu/icu_50.1.bb

\ No newline at end of file
Saul Wold - Jan. 3, 2013, 10:11 p.m.
On 12/27/2012 06:44 PM, Marko Lindqvist wrote:
> This seems to fix HarfBuzz compile problems.
>
Just found a problem with this in my testing:

> | configure:3983: error: No such directory /home/sgw/yocto/builds/world/tmp/sysroots/x86_64-linux/usr/share/icu/50.1.1 supplied as the argument to --with-cross-build. Use an absolute path.

Seems that icu lays down a /usr/share/icu/50.1 directory, not a ${PV}, 
so this needs a little work.

I am still testing with HaftBuzz, I saw one issue with building it that 
I need to investigate further.

Sau!
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
>   meta/recipes-support/icu/icu_50.1.1.bb |   11 +++++++++++
>   meta/recipes-support/icu/icu_50.1.bb   |   11 -----------
>   2 files changed, 11 insertions(+), 11 deletions(-)
>   create mode 100644 meta/recipes-support/icu/icu_50.1.1.bb
>   delete mode 100644 meta/recipes-support/icu/icu_50.1.bb
>
> diff --git a/meta/recipes-support/icu/icu_50.1.1.bb b/meta/recipes-support/icu/icu_50.1.1.bb
> new file mode 100644
> index 0000000..26b086f
> --- /dev/null
> +++ b/meta/recipes-support/icu/icu_50.1.1.bb
> @@ -0,0 +1,11 @@
> +require icu.inc
> +
> +LIC_FILES_CHKSUM = "file://../license.html;md5=4ee45701e87d34303281978e3b78ecda"
> +
> +PR = "r0"
> +
> +BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-50_1_1-src.tgz"
> +SRC_URI = "${BASE_SRC_URI}"
> +
> +SRC_URI[md5sum] = "c721c2e0c8f86975ccea620d09aedc81"
> +SRC_URI[sha256sum] = "a6f426e3c04749c74bcb9d2ce229f905de88deda2353db2249f2e96fe604df8f"
> diff --git a/meta/recipes-support/icu/icu_50.1.bb b/meta/recipes-support/icu/icu_50.1.bb
> deleted file mode 100644
> index 8f65c6d..0000000
> --- a/meta/recipes-support/icu/icu_50.1.bb
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -require icu.inc
> -
> -LIC_FILES_CHKSUM = "file://../license.html;md5=4ee45701e87d34303281978e3b78ecda"
> -
> -PR = "r1"
> -
> -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/50.1/icu4c-50_1-src.tgz"
> -SRC_URI = "${BASE_SRC_URI}"
> -
> -SRC_URI[md5sum] = "cf7bf9e56aa6c2057a8b6f464046483e"
> -SRC_URI[sha256sum] = "68592b3c07d9b86100f41d0172eb1a81f3ffb2a8fef1104d7395099079ba7350"
> \ No newline at end of file
>
Marko Lindqvist - Jan. 4, 2013, 2:17 a.m.
On 4 January 2013 00:11, Saul Wold <sgw@linux.intel.com> wrote:
> On 12/27/2012 06:44 PM, Marko Lindqvist wrote:
>>
>> This seems to fix HarfBuzz compile problems.
>>
> Just found a problem with this in my testing:
>
>> | configure:3983: error: No such directory
>> /home/sgw/yocto/builds/world/tmp/sysroots/x86_64-linux/usr/share/icu/50.1.1
>> supplied as the argument to --with-cross-build. Use an absolute path.
>
> Seems that icu lays down a /usr/share/icu/50.1 directory, not a ${PV}, so
> this needs a little work.

 Can you tell anything more about the situation where this came up? I
tried to reproduce, but icu-native build created, and icu build used
.../icu/50.1.1/... just right.

 Was that with already populated tree where just the icu update patch
had been applied? I'm guessing if icu-native and icu builds somehow
happened concurrently, and icu-native was not ready by the time icu
needed it. Then that 50.1 directory you saw could be leftover from
earlier version.


 - ML
Saul Wold - Jan. 4, 2013, 7:05 p.m.
On 01/03/2013 06:17 PM, Marko Lindqvist wrote:
> On 4 January 2013 00:11, Saul Wold <sgw@linux.intel.com> wrote:
>> On 12/27/2012 06:44 PM, Marko Lindqvist wrote:
>>>
>>> This seems to fix HarfBuzz compile problems.
>>>
>> Just found a problem with this in my testing:
>>
>>> | configure:3983: error: No such directory
>>> /home/sgw/yocto/builds/world/tmp/sysroots/x86_64-linux/usr/share/icu/50.1.1
>>> supplied as the argument to --with-cross-build. Use an absolute path.
>>
>> Seems that icu lays down a /usr/share/icu/50.1 directory, not a ${PV}, so
>> this needs a little work.
>
>   Can you tell anything more about the situation where this came up? I
> tried to reproduce, but icu-native build created, and icu build used
> .../icu/50.1.1/... just right.
>
>   Was that with already populated tree where just the icu update patch
> had been applied? I'm guessing if icu-native and icu builds somehow
> happened concurrently, and icu-native was not ready by the time icu
> needed it. Then that 50.1 directory you saw could be leftover from
> earlier version.
>
>
Hmm, when you build the new version of icu-native, what does it create 
for you in your tmp/sysroot/x86*-linux/usr/share?

Thanks
    Sau!



>   - ML
>
Marko Lindqvist - Jan. 4, 2013, 7:34 p.m.
On 4 January 2013 21:05, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/03/2013 06:17 PM, Marko Lindqvist wrote:
>>
>> On 4 January 2013 00:11, Saul Wold <sgw@linux.intel.com> wrote:
>>>
>>>>
>>> Just found a problem with this in my testing:
>>>
>>>> | configure:3983: error: No such directory
>>>>
>>>> /home/sgw/yocto/builds/world/tmp/sysroots/x86_64-linux/usr/share/icu/50.1.1
>>>> supplied as the argument to --with-cross-build. Use an absolute path.
>>>
>>> Seems that icu lays down a /usr/share/icu/50.1 directory, not a ${PV}, so
>>> this needs a little work.
>>
>>   Can you tell anything more about the situation where this came up? I
>> tried to reproduce, but icu-native build created, and icu build used
>> .../icu/50.1.1/... just right.
>>
> Hmm, when you build the new version of icu-native, what does it create for
> you in your tmp/sysroot/x86*-linux/usr/share?

 icu/50.1.1/


 - ML

Patch

diff --git a/meta/recipes-support/icu/icu_50.1.1.bb b/meta/recipes-support/icu/icu_50.1.1.bb
new file mode 100644
index 0000000..26b086f
--- /dev/null
+++ b/meta/recipes-support/icu/icu_50.1.1.bb
@@ -0,0 +1,11 @@ 
+require icu.inc
+
+LIC_FILES_CHKSUM = "file://../license.html;md5=4ee45701e87d34303281978e3b78ecda"
+
+PR = "r0"
+
+BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-50_1_1-src.tgz"
+SRC_URI = "${BASE_SRC_URI}"
+
+SRC_URI[md5sum] = "c721c2e0c8f86975ccea620d09aedc81"
+SRC_URI[sha256sum] = "a6f426e3c04749c74bcb9d2ce229f905de88deda2353db2249f2e96fe604df8f"
diff --git a/meta/recipes-support/icu/icu_50.1.bb b/meta/recipes-support/icu/icu_50.1.bb
deleted file mode 100644
index 8f65c6d..0000000
--- a/meta/recipes-support/icu/icu_50.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@ 
-require icu.inc
-
-LIC_FILES_CHKSUM = "file://../license.html;md5=4ee45701e87d34303281978e3b78ecda"
-
-PR = "r1"
-
-BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/50.1/icu4c-50_1-src.tgz"
-SRC_URI = "${BASE_SRC_URI}"
-
-SRC_URI[md5sum] = "cf7bf9e56aa6c2057a8b6f464046483e"
-SRC_URI[sha256sum] = "68592b3c07d9b86100f41d0172eb1a81f3ffb2a8fef1104d7395099079ba7350"