Commit b3adc813 authored by Killian Lufau's avatar Killian Lufau Committed by Julien Muchembled

openssl: INSTALL_PREFIX renamed to DESTDIR, environ ignored

Because there's no way anymore to pass the install prefix via an environment
variable, a new `make-install-extra` option (empty by default) is added so
that `make install` command line can be extended with `DESTDIR=...`.

/reviewed-on nexedi/slapos!524
parent 83635f59
...@@ -21,8 +21,9 @@ url = https://www.openssl.org/source/openssl-1.1.0j.tar.gz ...@@ -21,8 +21,9 @@ url = https://www.openssl.org/source/openssl-1.1.0j.tar.gz
md5sum = b4ca5b78ae6ae79da80790b30dbedbdc md5sum = b4ca5b78ae6ae79da80790b30dbedbdc
location = @@LOCATION@@ location = @@LOCATION@@
# 'prefix' option to override --openssldir/--prefix (which is useful # 'prefix' option to override --openssldir/--prefix (which is useful
# when combined with INSTALL_PREFIX). Used by slapos.package.git/obs # when combined with DESTDIR). Used by slapos.package.git/obs
prefix = ${:location} prefix = ${:location}
make-install-extra =
certs = ${:location}/etc/ssl/certs certs = ${:location}/etc/ssl/certs
configure-command = ./config configure-command = ./config
configure-options = configure-options =
...@@ -37,7 +38,7 @@ configure-options = ...@@ -37,7 +38,7 @@ configure-options =
make-options = make-options =
SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib' SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
make-targets = make-targets =
-j1 install_sw install_ssldirs && -j1 install_sw install_ssldirs ${:make-install-extra} &&
rm -f ${:certs}/* && rm -f ${:certs}/* &&
for i in ${ca-certificates:location}/certs/*/*.crt; do for i in ${ca-certificates:location}/certs/*/*.crt; do
ln -sfv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0 ln -sfv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
......
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