[Buildroot] [PATCH 1/1] package/gobject-introspection: fix gidatadir

[Buildroot] [PATCH 1/1] package/gobject-introspection: fix gidatadir

[Fabrice Fontaine]

Since commit 521d387640d704f24caee51841388d98bcac739b gidatadir is
wrongly set to ${libdir}/../share, set it back to
${datadir}/gobject-introspection-1.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/gobject-introspection/gobject-introspection.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
index f56d0c5eff..81938b14df 100644
--- a/package/gobject-introspection/gobject-introspection.mk
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -121,7 +121,7 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
 	# causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share.
 	# Change datadir to $(libdir)/../share which will prefix $(STAGING_DIR)
 	# to the correct location.
-	$(SED) "s%datadir=.*%datadir=\$${libdir}/../share%g" \
+	$(SED) "s%^datadir=.*%datadir=\$${libdir}/../share%g" \
 		$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
 
 	# By default, girdir and typelibdir use datadir and libdir as their prefix,
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gobject-introspection: fix gidatadir

[Thomas Petazzoni]

On Tue, 10 Aug 2021 00:42:14 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Since commit 521d387640d704f24caee51841388d98bcac739b gidatadir is
> wrongly set to ${libdir}/../share, set it back to
> ${datadir}/gobject-introspection-1.0
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/gobject-introspection/gobject-introspection.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gobject-introspection: fix gidatadir

[Baruch Siach]

Hi Thomas,

On Fri, Aug 13 2021, Thomas Petazzoni wrote:
> On Tue, 10 Aug 2021 00:42:14 +0200
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
>> Since commit 521d387640d704f24caee51841388d98bcac739b gidatadir is
>> wrongly set to ${libdir}/../share, set it back to
>> ${datadir}/gobject-introspection-1.0
>> 
>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> ---
>>  package/gobject-introspection/gobject-introspection.mk | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Applied to master, thanks.

Not in master as of commit 921830e92d8b.

You applied the exec_prefix fix[1] instead (commit 34da8f96141f).

Both are marked as accepted in patchwork.

[1] http://patchwork.ozlabs.org/project/buildroot/patch/20210809223547.2961300-1-fontaine.fabrice@gmail.com/

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gobject-introspection: fix gidatadir

[Thomas Petazzoni]

On Fri, 13 Aug 2021 07:07:38 +0300
Baruch Siach <baruch@tkos.co.il> wrote:

> Not in master as of commit 921830e92d8b.
> 
> You applied the exec_prefix fix[1] instead (commit 34da8f96141f).
> 
> Both are marked as accepted in patchwork.
> 
> [1] http://patchwork.ozlabs.org/project/buildroot/patch/20210809223547.2961300-1-fontaine.fabrice@gmail.com/

Thanks for noticing this, indeed I was mistaken by the multiple
gobject-introspection fixes. It's really great that you keep track this
way of what gets applied and report back when there is an issue,
definitely useful!

Thanks,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot