Skip to contentSkip to conversation

package/nodejs: Use zlib headers from HOST_ZLIB_SRCDIR for host-nodejs

PATCH New James Hilliard 3 participants 4 messages Feb 18, 2020 – Apr 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 package/nodejs: Use zlib headers from HOST_ZLIB_SRCDIR 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 using headers from HOST_ZLIB_SRCDIR so that the ICU headers in the system include directory are not used.

---
Changes v4 -> v5:
- use headers from HOST_ZLIB_SRCDIR
- use shared zlib instead of static zlib

---
 package/nodejs/nodejs.mk | 2 ++
 1 file changed, 2 insertions(+)
package/nodejs/nodejs.mk +2 -0
index 0de3495df9..30f5b35809 100644
@@ -64,6 +64,8 @@ define HOST_NODEJS_CONFIGURE_CMDS
 		--shared-openssl-includes=$(HOST_DIR)/include/openssl \
 		--shared-openssl-libpath=$(HOST_DIR)/lib \
 		--shared-zlib \
+		--shared-zlib-includes=$(HOST_ZLIB_SRCDIR) \
+		--shared-zlib-libpath=$(HOST_DIR)/lib \
 		--no-cross-compiling \
 		--with-intl=small-icu \
 	)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v5 1/1 package/nodejs: Use zlib headers from HOST_ZLIB_SRCDIR for host-nodejs

Quoted 6 lines · James Hilliard

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.

Quoted 6 lines

Fix this by using headers from HOST_ZLIB_SRCDIR so that the ICU headers in the system include directory are not used.

---

Hello,

Just FYI , we had issues building our distro based on 2020.02 buildroot, but this patch fixes the host node-js build problem.

So thanks for fixing it,

Eugen

#2 lore raw

PATCH v5 1/1 package/nodejs: Use zlib headers from HOST_ZLIB_SRCDIR for host-nodejs

In reply to James Hilliard

Op di 18 feb. 2020 om 04:15 schreef James Hilliard <[email protected]>:

Quoted 34 lines

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 using headers from HOST_ZLIB_SRCDIR so that the ICU headers in the system include directory are not used.

---
Changes v4 -> v5:
- use headers from HOST_ZLIB_SRCDIR
- use shared zlib instead of static zlib

---
 package/nodejs/nodejs.mk | 2 ++
 1 file changed, 2 insertions(+)
package/nodejs/nodejs.mk +2 -1
index 0de3495df9..30f5b35809 100644
@@ -64,6 +64,8 @@ define HOST_NODEJS_CONFIGURE_CMDS
                --shared-openssl-includes=$(HOST_DIR)/include/openssl \
                --shared-openssl-libpath=$(HOST_DIR)/lib \
                --shared-zlib \
+               --shared-zlib-includes=$(HOST_ZLIB_SRCDIR) \
+               --shared-zlib-libpath=$(HOST_DIR)/lib \
                --no-cross-compiling \
                --with-intl=small-icu \
        )
--
Quoted 2 lines

2.20.1

Hi,

I had the same compilation issue on 2020.02. This patch fixed it for me.

Best regards,

Johan

#3 lore raw

PATCH v5 1/1 package/nodejs: Use zlib headers from HOST_ZLIB_SRCDIR for host-nodejs

Will probably also fix
http://autobuild.buildroot.net/results/8ad67efd68b45a7e7f7734377e3863c4ad7fa101/

Op di 31 mrt. 2020 om 15:11 schreef Johan Derycke <[email protected]>:

Quoted 48 lines

Op di 18 feb. 2020 om 04:15 schreef James Hilliard <[email protected]>:

Quoted 34 lines

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 using headers from HOST_ZLIB_SRCDIR so that the ICU headers in the system include directory are not used.

---
Changes v4 -> v5:
- use headers from HOST_ZLIB_SRCDIR
- use shared zlib instead of static zlib

---
 package/nodejs/nodejs.mk | 2 ++
 1 file changed, 2 insertions(+)
package/nodejs/nodejs.mk +2 -1
index 0de3495df9..30f5b35809 100644
@@ -64,6 +64,8 @@ define HOST_NODEJS_CONFIGURE_CMDS
                --shared-openssl-includes=$(HOST_DIR)/include/openssl \
                --shared-openssl-libpath=$(HOST_DIR)/lib \
                --shared-zlib \
+               --shared-zlib-includes=$(HOST_ZLIB_SRCDIR) \
+               --shared-zlib-libpath=$(HOST_DIR)/lib \
                --no-cross-compiling \
                --with-intl=small-icu \
        )
--
Quoted 2 lines

2.20.1

Hi,

I had the same compilation issue on 2020.02. This patch fixed it for me.

Best regards,

Johan