mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] openssl: Use CROSS_LIB_DIR.
@ 2021-04-26 21:21 Christian Melki
  2021-05-07  6:07 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2021-04-26 21:21 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki, mkl

Instead of using static paths, resolve them instead.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/openssl.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/openssl.make b/rules/openssl.make
index f8d07b472..492bac3e1 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -65,8 +65,8 @@ endif
 #
 OPENSSL_CONF_OPT := \
 	--prefix=/usr \
-	--libdir=/usr/lib \
-	--openssldir=/usr/lib/ssl \
+	--libdir=/usr/$(CROSS_LIB_DIR) \
+	--openssldir=/usr/$(CROSS_LIB_DIR)/ssl \
 	shared \
 	$(call ptx/ifdef, PTXCONF_OPENSSL_CRYPTODEV, enable-devcryptoeng, no-devcryptoeng) \
 	no-idea \
@@ -106,7 +106,7 @@ ifdef PTXCONF_OPENSSL_BIN
 endif
 
 	@$(call install_alternative, openssl, 0, 0, 0644, \
-		/usr/lib/ssl/openssl.cnf)
+		/usr/$(CROSS_LIB_DIR)/ssl/openssl.cnf)
 
 	@$(call install_lib, openssl, 0, 0, 0644, libssl)
 	@$(call install_lib, openssl, 0, 0, 0644, libcrypto)
-- 
2.31.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] openssl: Use CROSS_LIB_DIR.
  2021-04-26 21:21 [ptxdist] [PATCH] openssl: Use CROSS_LIB_DIR Christian Melki
@ 2021-05-07  6:07 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-05-07  6:07 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki

Thanks, applied as c7cc9947310d21466e4f25b31d989570992c3706.

Michael

[sent from post-receive hook]

On Fri, 07 May 2021 08:07:07 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Instead of using static paths, resolve them instead.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20210426212152.19976-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/openssl.make b/rules/openssl.make
> index f8d07b4722c6..492bac3e1b1b 100644
> --- a/rules/openssl.make
> +++ b/rules/openssl.make
> @@ -65,8 +65,8 @@ endif
>  #
>  OPENSSL_CONF_OPT := \
>  	--prefix=/usr \
> -	--libdir=/usr/lib \
> -	--openssldir=/usr/lib/ssl \
> +	--libdir=/usr/$(CROSS_LIB_DIR) \
> +	--openssldir=/usr/$(CROSS_LIB_DIR)/ssl \
>  	shared \
>  	$(call ptx/ifdef, PTXCONF_OPENSSL_CRYPTODEV, enable-devcryptoeng, no-devcryptoeng) \
>  	no-idea \
> @@ -106,7 +106,7 @@ ifdef PTXCONF_OPENSSL_BIN
>  endif
>  
>  	@$(call install_alternative, openssl, 0, 0, 0644, \
> -		/usr/lib/ssl/openssl.cnf)
> +		/usr/$(CROSS_LIB_DIR)/ssl/openssl.cnf)
>  
>  	@$(call install_lib, openssl, 0, 0, 0644, libssl)
>  	@$(call install_lib, openssl, 0, 0, 0644, libcrypto)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-07  6:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-26 21:21 [ptxdist] [PATCH] openssl: Use CROSS_LIB_DIR Christian Melki
2021-05-07  6:07 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox