mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] libcap.make: Make library installation follow CROSS_LIB_DIR
@ 2021-05-19 10:13 Christian Melki
  2021-05-27  6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2021-05-19 10:13 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/libcap.make b/rules/libcap.make
index 45f09d97f..cdc44dfe0 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -30,7 +30,7 @@ LIBCAP_LICENSE_FILES := file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1
 # ----------------------------------------------------------------------------
 
 LIBCAP_MAKE_OPT	:= \
-	prefix=/usr lib=lib \
+	prefix=/usr lib=$(CROSS_LIB_DIR) \
 	CC=$(CROSS_CC) \
 	BUILD_CC=$(HOSTCC) \
 	DYNAMIC=yes \
@@ -61,7 +61,7 @@ $(STATEDIR)/libcap.targetinstall:
 	@$(call install_lib,  libcap, 0, 0, 0644, libcap)
 ifdef PTXCONF_GLOBAL_PAM
 	@$(call install_copy, libcap, 0, 0, 0755, -, \
-		/usr/lib/security/pam_cap.so)
+		/usr/$(CROSS_LIB_DIR)/security/pam_cap.so)
 endif
 ifdef PTXCONF_LIBCAP_SETCAP
 	@$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/setcap)
-- 
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] libcap.make: Make library installation follow CROSS_LIB_DIR
  2021-05-19 10:13 [ptxdist] [PATCH] libcap.make: Make library installation follow CROSS_LIB_DIR Christian Melki
@ 2021-05-27  6:45 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-05-27  6:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki

Thanks, applied as 39334547d5f61b2d10cbfbaf2588e99738d38e84.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:54 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20210519101328.16225-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libcap.make b/rules/libcap.make
> index 45f09d97f538..cdc44dfe0071 100644
> --- a/rules/libcap.make
> +++ b/rules/libcap.make
> @@ -30,7 +30,7 @@ LIBCAP_LICENSE_FILES := file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1
>  # ----------------------------------------------------------------------------
>  
>  LIBCAP_MAKE_OPT	:= \
> -	prefix=/usr lib=lib \
> +	prefix=/usr lib=$(CROSS_LIB_DIR) \
>  	CC=$(CROSS_CC) \
>  	BUILD_CC=$(HOSTCC) \
>  	DYNAMIC=yes \
> @@ -61,7 +61,7 @@ $(STATEDIR)/libcap.targetinstall:
>  	@$(call install_lib,  libcap, 0, 0, 0644, libcap)
>  ifdef PTXCONF_GLOBAL_PAM
>  	@$(call install_copy, libcap, 0, 0, 0755, -, \
> -		/usr/lib/security/pam_cap.so)
> +		/usr/$(CROSS_LIB_DIR)/security/pam_cap.so)
>  endif
>  ifdef PTXCONF_LIBCAP_SETCAP
>  	@$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/setcap)

_______________________________________________
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-27  6:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 10:13 [ptxdist] [PATCH] libcap.make: Make library installation follow CROSS_LIB_DIR Christian Melki
2021-05-27  6:45 ` [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