mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] glib.make: Follow CROSS_LIB_DIR.
@ 2021-07-02 11:15 Christian Melki
  2021-07-05  8:27 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2021-07-02 11:15 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/glib.make b/rules/glib.make
index 007893fd4..304b3bff0 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -63,10 +63,10 @@ GLIB_CONF_OPT	:= \
 $(STATEDIR)/glib.install.post:
 	@$(call targetinfo)
 	@sed -i 's;^bindir=.*;bindir=$(PTXDIST_SYSROOT_HOST)/bin;' \
-		 $(GLIB_PKGDIR)/usr/lib/pkgconfig/gio-2.0.pc
+		 $(GLIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/pkgconfig/gio-2.0.pc
 	@sed -i "s;'/usr;'$(SYSROOT)/usr;" \
-		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/lib/libglib-2.0.so*-gdb.py \
-		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so*-gdb.py
+		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/$(CROSS_LIB_DIR)/libglib-2.0.so*-gdb.py \
+		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/$(CROSS_LIB_DIR)/libgobject-2.0.so*-gdb.py
 	@$(call world/install.post, GLIB)
 	@$(call touch)
 
-- 
2.32.0


_______________________________________________
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] glib.make: Follow CROSS_LIB_DIR.
  2021-07-02 11:15 [ptxdist] [PATCH] glib.make: Follow CROSS_LIB_DIR Christian Melki
@ 2021-07-05  8:27 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-07-05  8:27 UTC (permalink / raw)
  To: ptxdist; +Cc: Christian Melki

Thanks, applied as 9409697ef8ae5f8099b20e50283ff5becfcc95d7.

Michael

[sent from post-receive hook]

On Mon, 05 Jul 2021 10:27:11 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20210702111556.7646-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/glib.make b/rules/glib.make
> index 007893fd4203..304b3bff0ef9 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -63,10 +63,10 @@ GLIB_CONF_OPT	:= \
>  $(STATEDIR)/glib.install.post:
>  	@$(call targetinfo)
>  	@sed -i 's;^bindir=.*;bindir=$(PTXDIST_SYSROOT_HOST)/bin;' \
> -		 $(GLIB_PKGDIR)/usr/lib/pkgconfig/gio-2.0.pc
> +		 $(GLIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/pkgconfig/gio-2.0.pc
>  	@sed -i "s;'/usr;'$(SYSROOT)/usr;" \
> -		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/lib/libglib-2.0.so*-gdb.py \
> -		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so*-gdb.py
> +		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/$(CROSS_LIB_DIR)/libglib-2.0.so*-gdb.py \
> +		$(GLIB_PKGDIR)/usr/share/gdb/auto-load/usr/$(CROSS_LIB_DIR)/libgobject-2.0.so*-gdb.py
>  	@$(call world/install.post, GLIB)
>  	@$(call touch)
>  

_______________________________________________
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-07-05  8:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 11:15 [ptxdist] [PATCH] glib.make: Follow CROSS_LIB_DIR Christian Melki
2021-07-05  8:27 ` [ptxdist] [APPLIED] " Michael Olbrich

mailarchive of the ptxdist mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.ptxdist.org/ptxdist/0 ptxdist/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ptxdist ptxdist/ https://lore.ptxdist.org/ptxdist \
		ptxdist@pengutronix.de
	public-inbox-index ptxdist

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git