Commit 5978fbf5 authored by Jérome Perrin's avatar Jérome Perrin

component/nodejs: reorganise use of [openssl] and [openssl-1.0]

Instead of using openssl-1.0 and overriding the new versions to use
openssl, use openssl by default and override in the old versions to use
openssl-1.0
parent ff5dab2e
...@@ -33,7 +33,6 @@ npm_config_tarball = ${nodejs-headers:target} ...@@ -33,7 +33,6 @@ npm_config_tarball = ${nodejs-headers:target}
[nodejs-16.19.0] [nodejs-16.19.0]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v16.19.0 version = v16.19.0
md5sum = e72b698681aff62bf17146ad70dc9425 md5sum = e72b698681aff62bf17146ad70dc9425
patches = patches =
...@@ -52,7 +51,6 @@ md5sum = e7bfbf135ae54d1dcca63bf17be84818 ...@@ -52,7 +51,6 @@ md5sum = e7bfbf135ae54d1dcca63bf17be84818
[nodejs-18.18.0] [nodejs-18.18.0]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v18.18.0 version = v18.18.0
md5sum = a1ce8df7e6b9df9f4ba3ff1d4e2173d2 md5sum = a1ce8df7e6b9df9f4ba3ff1d4e2173d2
...@@ -64,13 +62,11 @@ md5sum = c5ab3e98977dfd639d830625d79eff52 ...@@ -64,13 +62,11 @@ md5sum = c5ab3e98977dfd639d830625d79eff52
[nodejs-14.16.0] [nodejs-14.16.0]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v14.16.0 version = v14.16.0
md5sum = 7dc3666f407bf4e12a01ce1be2883d31 md5sum = 7dc3666f407bf4e12a01ce1be2883d31
[nodejs-12.18.3] [nodejs-12.18.3]
<= nodejs-base <= nodejs-base
openssl_location = ${openssl:location}
version = v12.18.3 version = v12.18.3
md5sum = 28bf6a4d98b238403fa58a0805f4a979 md5sum = 28bf6a4d98b238403fa58a0805f4a979
PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
...@@ -80,6 +76,7 @@ configure-command = ./configure ...@@ -80,6 +76,7 @@ configure-command = ./configure
<= nodejs-base <= nodejs-base
version = v8.9.4 version = v8.9.4
md5sum = 4ddc1daff327d7e6f63da57fdfc24f55 md5sum = 4ddc1daff327d7e6f63da57fdfc24f55
openssl-location = ${openssl-1.0:location}
PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
configure-command = ./configure configure-command = ./configure
...@@ -87,6 +84,7 @@ configure-command = ./configure ...@@ -87,6 +84,7 @@ configure-command = ./configure
<= nodejs-base <= nodejs-base
version = v8.12.0 version = v8.12.0
md5sum = 5690333b77964edf81945fc724f6ea85 md5sum = 5690333b77964edf81945fc724f6ea85
openssl-location = ${openssl-1.0:location}
PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
configure-command = ./configure configure-command = ./configure
...@@ -94,7 +92,7 @@ configure-command = ./configure ...@@ -94,7 +92,7 @@ configure-command = ./configure
# Server-side Javascript. # Server-side Javascript.
version = version =
md5sum = md5sum =
openssl_location = ${openssl-1.0:location} openssl-location = ${openssl:location}
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
...@@ -103,16 +101,16 @@ configure-command = python3 configure ...@@ -103,16 +101,16 @@ configure-command = python3 configure
configure-options = configure-options =
--prefix=%(location)s --prefix=%(location)s
--shared-openssl --shared-openssl
--shared-openssl-includes=${:openssl_location}/include --shared-openssl-includes=${:openssl-location}/include
--shared-openssl-libpath=${:openssl_location}/lib --shared-openssl-libpath=${:openssl-location}/lib
PATH = ${python3:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH = ${python3:location}/bin:${pkgconfig:location}/bin:%(PATH)s
environment = environment =
HOME=@@LOCATION@@ HOME=@@LOCATION@@
PATH=${:PATH} PATH=${:PATH}
PKG_CONFIG_PATH=${:openssl_location}/lib/pkgconfig/ PKG_CONFIG_PATH=${:openssl-location}/lib/pkgconfig/
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${:openssl-location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LD_LIBRARY_PATH=${:openssl_location}/lib LD_LIBRARY_PATH=${:openssl-location}/lib
[nodejs-headers-base] [nodejs-headers-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment