[meta-oe,sumo] nodejs: Enable system ICU support

Submitted by Raphael Kubo da Costa on Nov. 20, 2018, 3:40 p.m. | Patch ID: 156438

Details

Message ID 20181120154041.9420-1-raphael.kubo.da.costa@intel.com
State New
Delegated to: Armin Kuster
Headers show

Commit Message

Raphael Kubo da Costa Nov. 20, 2018, 3:40 p.m.
From: Khem Raj <raj.khem@gmail.com>

Latest Chromium needs it during build

(cherry picked from commit d7d0cc5227d0dc7d3ff91ded9da841d65c3f3632)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
index 8930cd902..132ee0f2b 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
@@ -3,7 +3,9 @@  HOMEPAGE = "http://nodejs.org"
 LICENSE = "MIT & BSD & Artistic-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=270f7477a1705f7cd3e29d3d4512915d"
 
-DEPENDS = "openssl10 zlib"
+DEPENDS = "openssl10 zlib icu"
+
+inherit pkgconfig
 
 COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
 COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
@@ -44,7 +46,7 @@  do_configure () {
     export LD="${CXX}"
     GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
     # $TARGET_ARCH settings don't match --dest-cpu settings
-   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
+   ./configure --prefix=${prefix} --with-intl=system-icu --without-snapshot --shared-openssl --shared-zlib \
                --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
                --dest-os=linux \
                ${ARCHFLAGS}

Comments

Khem Raj Nov. 26, 2018, 5:45 p.m.
Armin

This is ok for rocko
On Tue, Nov 20, 2018 at 7:40 AM Raphael Kubo da Costa
<raphael.kubo.da.costa@intel.com> wrote:
>
> From: Khem Raj <raj.khem@gmail.com>
>
> Latest Chromium needs it during build
>
> (cherry picked from commit d7d0cc5227d0dc7d3ff91ded9da841d65c3f3632)
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
> ---
>  meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
> index 8930cd902..132ee0f2b 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
> @@ -3,7 +3,9 @@ HOMEPAGE = "http://nodejs.org"
>  LICENSE = "MIT & BSD & Artistic-2.0"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=270f7477a1705f7cd3e29d3d4512915d"
>
> -DEPENDS = "openssl10 zlib"
> +DEPENDS = "openssl10 zlib icu"
> +
> +inherit pkgconfig
>
>  COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
>  COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
> @@ -44,7 +46,7 @@ do_configure () {
>      export LD="${CXX}"
>      GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
>      # $TARGET_ARCH settings don't match --dest-cpu settings
> -   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
> +   ./configure --prefix=${prefix} --with-intl=system-icu --without-snapshot --shared-openssl --shared-zlib \
>                 --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
>                 --dest-os=linux \
>                 ${ARCHFLAGS}
> --
> 2.19.1
>
Khem Raj Nov. 26, 2018, 5:46 p.m.
and sumo too
On Mon, Nov 26, 2018 at 9:45 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> Armin
>
> This is ok for rocko
> On Tue, Nov 20, 2018 at 7:40 AM Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> wrote:
> >
> > From: Khem Raj <raj.khem@gmail.com>
> >
> > Latest Chromium needs it during build
> >
> > (cherry picked from commit d7d0cc5227d0dc7d3ff91ded9da841d65c3f3632)
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
> > ---
> >  meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
> > index 8930cd902..132ee0f2b 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
> > @@ -3,7 +3,9 @@ HOMEPAGE = "http://nodejs.org"
> >  LICENSE = "MIT & BSD & Artistic-2.0"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=270f7477a1705f7cd3e29d3d4512915d"
> >
> > -DEPENDS = "openssl10 zlib"
> > +DEPENDS = "openssl10 zlib icu"
> > +
> > +inherit pkgconfig
> >
> >  COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
> >  COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
> > @@ -44,7 +46,7 @@ do_configure () {
> >      export LD="${CXX}"
> >      GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
> >      # $TARGET_ARCH settings don't match --dest-cpu settings
> > -   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
> > +   ./configure --prefix=${prefix} --with-intl=system-icu --without-snapshot --shared-openssl --shared-zlib \
> >                 --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
> >                 --dest-os=linux \
> >                 ${ARCHFLAGS}
> > --
> > 2.19.1
> >
Armin Kuster Nov. 27, 2018, 8:05 p.m.
On 11/26/18 10:45 AM, Khem Raj wrote:
> Armin
>
> This is ok for rocko
> On Tue, Nov 20, 2018 at 7:40 AM Raphael Kubo da Costa
> <raphael.kubo.da.costa@intel.com> wrote:
>> From: Khem Raj <raj.khem@gmail.com>
>>
>> Latest Chromium needs it during build

Is this keeping chromium from building. Is there anyway to have this
done via PACKAGECONFIG?

- armin
>>
>> (cherry picked from commit d7d0cc5227d0dc7d3ff91ded9da841d65c3f3632)
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
>> ---
>>  meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
>> index 8930cd902..132ee0f2b 100644
>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
>> @@ -3,7 +3,9 @@ HOMEPAGE = "http://nodejs.org"
>>  LICENSE = "MIT & BSD & Artistic-2.0"
>>  LIC_FILES_CHKSUM = "file://LICENSE;md5=270f7477a1705f7cd3e29d3d4512915d"
>>
>> -DEPENDS = "openssl10 zlib"
>> +DEPENDS = "openssl10 zlib icu"
>> +
>> +inherit pkgconfig
>>
>>  COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
>>  COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
>> @@ -44,7 +46,7 @@ do_configure () {
>>      export LD="${CXX}"
>>      GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
>>      # $TARGET_ARCH settings don't match --dest-cpu settings
>> -   ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
>> +   ./configure --prefix=${prefix} --with-intl=system-icu --without-snapshot --shared-openssl --shared-zlib \
>>                 --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
>>                 --dest-os=linux \
>>                 ${ARCHFLAGS}
>> --
>> 2.19.1
>>
Raphael Kubo da Costa Nov. 28, 2018, 1:47 p.m.
akuster808 <akuster808@gmail.com> writes:

> On 11/26/18 10:45 AM, Khem Raj wrote:
>> Armin
>>
>> This is ok for rocko
>> On Tue, Nov 20, 2018 at 7:40 AM Raphael Kubo da Costa
>> <raphael.kubo.da.costa@intel.com> wrote:
>>> From: Khem Raj <raj.khem@gmail.com>
>>>
>>> Latest Chromium needs it during build
>
> Is this keeping chromium from building.

Yes.
Raphael Kubo da Costa Dec. 10, 2018, 9:22 a.m.
Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> writes:

> akuster808 <akuster808@gmail.com> writes:
>
>> On 11/26/18 10:45 AM, Khem Raj wrote:
>>> Armin
>>>
>>> This is ok for rocko
>>> On Tue, Nov 20, 2018 at 7:40 AM Raphael Kubo da Costa
>>> <raphael.kubo.da.costa@intel.com> wrote:
>>>> From: Khem Raj <raj.khem@gmail.com>
>>>>
>>>> Latest Chromium needs it during build
>>
>> Is this keeping chromium from building.
>
> Yes.

ping...