Skip to content
This repository was archived by the owner on Jul 6, 2020. It is now read-only.

Commit 8af91ac

Browse files
author
Andrei Gherzan
committed
meta-balena-supervisor/nodejs: Restructure and fix version 6
First of all we fix the path of the inc file required by nodejs_6.13.1.bb by specifying a correct FILESEXTRAPATHS relative to the recipe's directory. We also add the DNS patch only for the 6 version as it is included in version 8 (which is the other version we are using). The last thing included in this patch is fixing compilation by using openssl 1.0.x for nodejs 6 because this version doesn't support openssl 1.1.x. See: nodejs/node#16130 Signed-off-by: Andrei Gherzan <[email protected]>
1 parent a1c1065 commit 8af91ac

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
GYP_DEFINES_append_i386-nlp = " v8_target_arch='x87' "
2-
FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
3-
SRC_URI_append = " \
4-
file://0001-dns-add-verbatim-option-to-dns.lookup.patch \
5-
"

meta-balena-supervisor/recipes-devtools/nodejs/nodejs_6.13.1.bb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
SRC_URI_append = " file://0001-dns-add-verbatim-option-to-dns.lookup.patch"
2+
3+
# Be able to find the following inc file
4+
FILESEXTRAPATHS_append := ":${THISDIR}/../../../meta-nodejs/recipes-devtools/${PN}/files"
15
require ${TOPDIR}/../meta-nodejs/recipes-devtools/nodejs/nodejs_6.inc
26

7+
# nodejs 6 doesn't compile with openssl 1.1.x so use the openssl10 dependency
8+
PACKAGECONFIG[openssl] = "--shared-openssl,,openssl10,"
9+
310
INC_PR = "r1"
411

512
LIC_FILES_CHKSUM = "file://LICENSE;md5=14152103612601231d62308345463670"

0 commit comments

Comments
 (0)