package/nodejs: use system-icu for host-nodejs
PATCH v6 1/1 package/nodejs: use system-icu for host-nodejs
The nodejs configure.py file orders zlib headers before the bundled ICU headers. The zlib headers happen to be located in the system include directory, next to some system ICU headers (not bundled). If these are built before nodejs is, nodejs will get confused and try to use the system ICU headers instead of the bundled ones.
Fix this by always using host-icu.
Set CXXFLAGS.target to -DU_DISABLE_RENAMING=1 when building with system-icu since host-icu is built with --disable-renaming.
Fixes:
- http://autobuild.buildroot.net/results/1ef947553ec762dba6a6202b1cfc84ceed75dbb2/
--- package/nodejs/nodejs.mk | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
package/nodejs/nodejs.mk +18 -11
@@ -10,7 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-icu NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE
@@ -26,6 +26,20 @@ NODEJS_CONF_OPTS = \ --cross-compiling \ --dest-os=linux +HOST_NODEJS_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --without-snapshot \ + --without-dtrace \ + --without-etw \ + --shared-openssl \ + --shared-openssl-includes=$(HOST_DIR)/include/openssl \ + --shared-openssl-libpath=$(HOST_DIR)/lib \ + --shared-zlib \ + --no-cross-compiling \ + --with-intl=system-icu + +HOST_NODEJS_CXXFLAGS = -DU_DISABLE_RENAMING=1 + ifeq ($(BR2_PACKAGE_OPENSSL),y) NODEJS_DEPENDENCIES += openssl NODEJS_CONF_OPTS += --shared-openssl
@@ -57,16 +71,7 @@ define HOST_NODEJS_CONFIGURE_CMDS PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ - --prefix=$(HOST_DIR) \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ - --shared-openssl \ - --shared-openssl-includes=$(HOST_DIR)/include/openssl \ - --shared-openssl-libpath=$(HOST_DIR)/lib \ - --shared-zlib \ - --no-cross-compiling \ - --with-intl=small-icu \ + $(HOST_NODEJS_CONF_OPTS) \ ) endef
@@ -81,6 +86,7 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)
@@ -90,6 +96,7 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)
Signature · 1 line
2.25.1
PATCH v6 1/1 package/nodejs: use system-icu for host-nodejs
James, All,
On 2020-07-27 03:49 -0600, James Hilliard spake thusly:
Quoted 37 lines
The nodejs
configure.pyfile orders zlib headers before the bundled ICU headers. The zlib headers happen to be located in the system include directory, next to some system ICU headers (not bundled). If these are built before nodejs is, nodejs will get confused and try to use the system ICU headers instead of the bundled ones.Fix this by always using host-icu.
Set CXXFLAGS.target to -DU_DISABLE_RENAMING=1 when building with system-icu since host-icu is built with --disable-renaming.
Fixes:
- http://autobuild.buildroot.net/results/1ef947553ec762dba6a6202b1cfc84ceed75dbb2/Signed-off-by James Hilliard <[email protected]>--- package/nodejs/nodejs.mk | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)package/nodejs/nodejs.mk +2
-1@@ -10,7 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-icu NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE@@ -26,6 +26,20 @@ NODEJS_CONF_OPTS = \ --cross-compiling \ --dest-os=linux +HOST_NODEJS_CONF_OPTS = \
package/nodejs/nodejs.mk NODEJS_CONF_OPTS = \ · line 39
Quoted 10 lines
package/nodejs/nodejs.mk +10
-0+ --prefix=$(HOST_DIR) \ + --without-snapshot \ + --without-dtrace \ + --without-etw \ + --shared-openssl \ + --shared-openssl-includes=$(HOST_DIR)/include/openssl \ + --shared-openssl-libpath=$(HOST_DIR)/lib \ + --shared-zlib \ + --no-cross-compiling \ + --with-intl=system-icu
Why did you need to introduce HOST_NODEJS_CONF_OPTS? Can't we just change --with-intl where it already is?
package/nodejs/nodejs.mk NODEJS_CONF_OPTS = \ · line 41
Quoted 1 line
package/nodejs/nodejs.mk +1
-0+HOST_NODEJS_CXXFLAGS = -DU_DISABLE_RENAMING=1
You forgot to propagate HOST_CXXFLAGS.
Quoted 22 lines
package/nodejs/nodejs.mk +1
-10ifeq ($(BR2_PACKAGE_OPENSSL),y) NODEJS_DEPENDENCIES += openssl NODEJS_CONF_OPTS += --shared-openssl@@ -57,16 +71,7 @@ define HOST_NODEJS_CONFIGURE_CMDS PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ - --prefix=$(HOST_DIR) \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ - --shared-openssl \ - --shared-openssl-includes=$(HOST_DIR)/include/openssl \ - --shared-openssl-libpath=$(HOST_DIR)/lib \ - --shared-zlib \ - --no-cross-compiling \ - --with-intl=small-icu \ + $(HOST_NODEJS_CONF_OPTS) \ ) endef
package/nodejs/nodejs.mk define HOST_NODEJS_BUILD_CMDS · line 90
Quoted 5 lines
package/nodejs/nodejs.mk +1
-0@@ -81,6 +86,7 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \
Why do we use CXXFLAGS.target but LDFLAGS.host ?
Regards,
Yann E. MORIN.
Quoted 17 lines
package/nodejs/nodejs.mk +1
-0NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)@@ -90,6 +96,7 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v6 1/1 package/nodejs: use system-icu for host-nodejs
Quoted 40 lines · Yann E. MORIN
James, All,
On 2020-07-27 03:49 -0600, James Hilliard spake thusly:
Quoted 36 lines
The nodejs
configure.pyfile orders zlib headers before the bundled ICU headers. The zlib headers happen to be located in the system include directory, next to some system ICU headers (not bundled). If these are built before nodejs is, nodejs will get confused and try to use the system ICU headers instead of the bundled ones.Fix this by always using host-icu.
Set CXXFLAGS.target to -DU_DISABLE_RENAMING=1 when building with system-icu since host-icu is built with --disable-renaming.
Fixes:
- http://autobuild.buildroot.net/results/1ef947553ec762dba6a6202b1cfc84ceed75dbb2/Signed-off-by James Hilliard <[email protected]>--- package/nodejs/nodejs.mk | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)package/nodejs/nodejs.mk +1
-1@@ -10,7 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-icu NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE@@ -26,6 +26,20 @@ NODEJS_CONF_OPTS = \ --cross-compiling \ --dest-os=linux
Quoted 14 lines
package/nodejs/nodejs.mk NODEJS_CONF_OPTS = \ · line 39
Quoted 11 lines
package/nodejs/nodejs.mk +11
-0+HOST_NODEJS_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --without-snapshot \ + --without-dtrace \ + --without-etw \ + --shared-openssl \ + --shared-openssl-includes=$(HOST_DIR)/include/openssl \ + --shared-openssl-libpath=$(HOST_DIR)/lib \ + --shared-zlib \ + --no-cross-compiling \ + --with-intl=system-icuWhy did you need to introduce
HOST_NODEJS_CONF_OPTS? Can't we just change --with-intl where it already is?
I thought it was cleaner this way but can change it back.
Quoted 4 lines
package/nodejs/nodejs.mk NODEJS_CONF_OPTS = \ · line 41
Quoted 2 lines
package/nodejs/nodejs.mk +1
-0+HOST_NODEJS_CXXFLAGS = -DU_DISABLE_RENAMING=1You forgot to propagate
HOST_CXXFLAGS.
Are you sure that's needed with the way the nodejs build system works?
Quoted 22 lines
Quoted 22 lines
package/nodejs/nodejs.mk +1
-10ifeq ($(BR2_PACKAGE_OPENSSL),y) NODEJS_DEPENDENCIES += openssl NODEJS_CONF_OPTS += --shared-openssl@@ -57,16 +71,7 @@ define HOST_NODEJS_CONFIGURE_CMDS PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ - --prefix=$(HOST_DIR) \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ - --shared-openssl \ - --shared-openssl-includes=$(HOST_DIR)/include/openssl \ - --shared-openssl-libpath=$(HOST_DIR)/lib \ - --shared-zlib \ - --no-cross-compiling \ - --with-intl=small-icu \ + $(HOST_NODEJS_CONF_OPTS) \ ) endef
Quoted 8 lines
package/nodejs/nodejs.mk define HOST_NODEJS_BUILD_CMDS · line 90
Quoted 6 lines
package/nodejs/nodejs.mk +1
-0@@ -81,6 +86,7 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \Why do we use CXXFLAGS.target but LDFLAGS.host ?
Not sure.
Quoted 29 lines
Regards,
Yann E. MORIN.Quoted 13 lines
package/nodejs/nodejs.mk +1
-1NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)@@ -90,6 +96,7 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) --2.25.1
Quoted 4 lines
_______________________________________________
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. |'------------------------------^-------^------------------^--------------------'
PATCH v6 1/1 package/nodejs: use system-icu for host-nodejs
James, All,
On 2020-07-27 04:28 -0600, James Hilliard spake thusly:
Quoted 9 lines · Yann E. MORIN
Quoted 8 lines
On 2020-07-27 03:49 -0600, James Hilliard spake thusly:
Quoted 7 lines
The nodejs
configure.pyfile orders zlib headers before the bundled ICU headers. The zlib headers happen to be located in the system include directory, next to some system ICU headers (not bundled). If these are built before nodejs is, nodejs will get confused and try to use the system ICU headers instead of the bundled ones.Fix this by always using host-icu.
[--SNIP--]
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
+HOST_NODEJS_CONF_OPTS = \
Why did you need to introduce
HOST_NODEJS_CONF_OPTS? Can't we just change --with-intl where it already is?I thought it was cleaner this way but can change it back.
No need to respin just for that.
Quoted 3 lines
Quoted 2 lines
Quoted 1 line
+HOST_NODEJS_CXXFLAGS = -DU_DISABLE_RENAMING=1
You forgot to propagate
HOST_CXXFLAGS.Are you sure that's needed with the way the nodejs build system works?
Well, CXXFLAGS are set in $(HOST_CONFIGURE_OPTS):
$ make printvars VARS=HOST_CONFIGURE_OPTS RAW_VARS=YES
[...] CXXFLAGS="$(HOST_CXXFLAGS)" [...]So, were they used previously? If not, then the commit log should say so.
However, I'm afraid they were. They at least contain the CFLAGS, which contain the optimisation level (-O2), but mnost importantly, contain the CPPFGLAGS, so contains the correct include path to $(HOST_DIR)/include
And it seems the default value for CXXFLAGS.target does use CXXFLAGS:
tools/gyp/pylib/gyp/generator/make.py:CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
So maybe we need something like:
HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1
and in the configure and build comands:
...
$(HOST_CONFIGURE_OPTS) \
CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \
...Regards,
Yann E. MORIN.
Quoted 63 lines
Quoted 21 lines
Quoted 21 lines
ifeq ($(BR2_PACKAGE_OPENSSL),y)
NODEJS_DEPENDENCIES+= openssl
NODEJS_CONF_OPTS+= --shared-opensslpackage/nodejs/nodejs.mk +1
-10@@ -57,16 +71,7 @@ define HOST_NODEJS_CONFIGURE_CMDS PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ - --prefix=$(HOST_DIR) \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ - --shared-openssl \ - --shared-openssl-includes=$(HOST_DIR)/include/openssl \ - --shared-openssl-libpath=$(HOST_DIR)/lib \ - --shared-zlib \ - --no-cross-compiling \ - --with-intl=small-icu \ + $(HOST_NODEJS_CONF_OPTS) \ ) endefQuoted 8 lines
package/nodejs/nodejs.mk define HOST_NODEJS_BUILD_CMDS · line 90
Quoted 6 lines
package/nodejs/nodejs.mk +1
-0@@ -81,6 +86,7 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \Why do we use CXXFLAGS.target but LDFLAGS.host ?
Not sure.
Quoted 24 lines
Regards,
Yann E. MORIN.Quoted 13 lines
package/nodejs/nodejs.mk +1
-1NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)@@ -90,6 +96,7 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS.target="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) --2.25.1
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot--
.-----------------.--------------------.------------------.--------------------.Quoted 5 lines
| 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. |'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'