From mboxrd@z Thu Jan  1 00:00:00 1970
From: James Hilliard <james.hilliard1@gmail.com>
Date: Sun, 26 Jan 2020 13:57:40 -0700
Subject: [Buildroot] [PATCH 1/1] package/nodejs: use system-icu for
 host-nodejs when available
In-Reply-To: <20200126162659.GR32369@scaer>
References: <20200126075848.66484-1-james.hilliard1@gmail.com>
 <20200126162659.GR32369@scaer>
Message-ID: <CADvTj4oy4x+9xKaZfz5wiiMf-qMfYJc1cjka-uCGYdYCj3aEBA@mail.gmail.com>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

On Sun, Jan 26, 2020 at 9:27 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> James, All,
>
> On 2020-01-26 00:58 -0700, James Hilliard spake thusly:
> > Fixes:
> >  - http://autobuild.buildroot.net/results/1ef947553ec762dba6a6202b1cfc84ceed75dbb2/
>
> Pointing to an autobuild failure is nice, but you really need to provide
> a bit more context and explanations on what you are doing here...
>
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> >  package/nodejs/nodejs.mk | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
> > index e6eb73d576..abc868c364 100644
> > --- a/package/nodejs/nodejs.mk
> > +++ b/package/nodejs/nodejs.mk
> > @@ -65,7 +65,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
> >               --shared-openssl-libpath=$(HOST_DIR)/lib \
> >               --shared-zlib \
> >               --no-cross-compiling \
> > -             --with-intl=small-icu \
> > +             --with-intl=$(if $(BR2_PACKAGE_ICU),system-icu,small-icu) \
>
> We already have a conditional block about icu, lines 35-40.
>
> >       )
> >  endef
> >
> > @@ -80,6 +80,7 @@ define HOST_NODEJS_BUILD_CMDS
> >       $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
> >               $(MAKE) -C $(@D) \
> >               $(HOST_CONFIGURE_OPTS) \
> > +             $(if $(BR2_PACKAGE_ICU),CXXFLAGS.target="-DU_DISABLE_RENAMING=1") \
>
> Why do you need to account for a target package when building the host
> variant of nodejs? If this is needed, then explain it in the commit log.
I was doing that because the target icu package determines if host-icu
is built, which breaks the small-icu host-nodejs build.
>
> Then, the way we usually pass such options is to append to the existing
> CXXFLAGS. With the above comment, that would probably yield something
> like (e.g. for target, ditto for host):
I tried that approach first but it didn't seem to work seemingly due to the
weird nodejs build system.
>
>     NODEJS_CXXFLAGS = $(TARGET_CXXFLAGS)
>
>     ifeq ($(BR2_PACKAGE_ICU),y)
>     NODEJS_DEPENDENCIES += icu
>     NODEJS_CONF_OPTS += --with-intl=system-icu
>     NODEJS_CXXFLAGS += -DU_DISABLE_RENAMING=1
>     else
>     NODEJS_CONF_OPTS += --with-intl=small-icu
>     endif
>
>     [...]
>
>     $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
>         $(MAKE) -C $(@D) \
>         $(TARGET_CONFIGURE_OPTS) \
>         CXXFLAGS="$(NODEJS_CXXFLAGS)" \
>         [...]
>
> Regards,
> Yann E. MORIN.
>
> >               LDFLAGS.host="$(HOST_LDFLAGS)" \
> >               NO_LOAD=cctest.target.mk \
> >               PATH=$(@D)/bin:$(BR_PATH)
> > @@ -89,6 +90,7 @@ define HOST_NODEJS_INSTALL_CMDS
> >       $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
> >               $(MAKE) -C $(@D) install \
> >               $(HOST_CONFIGURE_OPTS) \
> > +             $(if $(BR2_PACKAGE_ICU),CXXFLAGS.target="-DU_DISABLE_RENAMING=1") \
> >               LDFLAGS.host="$(HOST_LDFLAGS)" \
> >               NO_LOAD=cctest.target.mk \
> >               PATH=$(@D)/bin:$(BR_PATH)
> > --
> > 2.20.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'