Skip to contentSkip to conversation

webkitgtk: add PACKAGECONFIG gobject-introspection

PATCH In review Andreas Müller 4 participants 9 messages Feb 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 webkitgtk: add PACKAGECONFIG gobject-introspection

Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what gobject-introspection.bbclass does automatically for projects build with autotools and meson.

It was checked: there are webkitgtk and libdnf inheriting gobject-introspection and cmake. Since libdnf cannot configure gir, webkitgtk seems the only project requiring gir-auto-enabling. So handle at recipe / no common magic at gobject-introspection.bbclass required.

---

This patch applies on top of master-next/Alex's patches sent

 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +2 -0
index 585723772e..d5085620d2 100644
@@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
           "
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
                    enchant \
                    libsecret \
@@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
 
 PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
 PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
+PACKAGECONFIG[gobject-introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF"
 PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
 PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
 PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
Signature · 1 line
2.21.0
#1 lore raw

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think?
This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

And for consistency, it would be good to do the same for gtk-doc.

Alex

${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \

${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \

Quoted 61 lines · Andreas Müller

Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what gobject-introspection.bbclass does automatically for projects build with autotools and meson.

It was checked: there are webkitgtk and libdnf inheriting gobject-introspection
and cmake. Since libdnf cannot configure gir, webkitgtk seems the only project
requiring gir-auto-enabling. So handle at recipe / no common magic at gobject-introspection.bbclass required.

---

This patch applies on top of master-next/Alex's patches sent

 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +1 -0
index 585723772e..d5085620d2 100644
@@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt
 libxt libidn libgcrypt \
           "
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11',
 d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES',
 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'webgl opengl', '' ,d)} \
                    enchant \
                    libsecret \
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
@@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
 'wayland x11', d)} \
 
 PACKAGECONFIG[wayland] =

"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
PACKAGECONFIG[x11] =
"-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11" +PACKAGECONFIG[gobject-introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF"
PACKAGECONFIG[geoclue] =
"-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
PACKAGECONFIG[enchant] =
"-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
PACKAGECONFIG[gtk2] =
"-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+" --
2.21.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#2 lore raw
Quoted 6 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

And for consistency, it would be good to do the same for gtk-doc.

This is odd: I fell over this because there was no gir created. Did not notice it was few lines below. Need to check that - maybe I am a bit off-sync to master or something is wrong elsewhere.

Will sync to master and send V2 then.

Andreas

Quoted 55 lines

Alex

${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \

${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \

Quoted 46 lines · Andreas Müller

Enable if 'gobject-introspection-data' is in DISTRO_FEATURES. This is what gobject-introspection.bbclass does automatically for projects build with autotools and meson.

It was checked: there are webkitgtk and libdnf inheriting gobject-introspection and cmake. Since libdnf cannot configure gir, webkitgtk seems the only project requiring gir-auto-enabling. So handle at recipe / no common magic at gobject-introspection.bbclass required.

---

This patch applies on top of master-next/Alex's patches sent

 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +2 -1
index 585723772e..d5085620d2 100644
@@ -39,6 +39,7 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
           "
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'gobject-introspection', '' ,d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl opengl', '' ,d)} \
                    enchant \
                    libsecret \
@@ -46,6 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
 
 PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
 PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11"
+PACKAGECONFIG[gobject-introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF"
 PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue"
 PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2"
 PACKAGECONFIG[gtk2] = "-DENABLE_PLUGIN_PROCESS_GTK2=ON,-DENABLE_PLUGIN_PROCESS_GTK2=OFF,gtk+"
--

2.21.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw
Quoted 8 lines · Andreas Müller
Quoted 5 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

Quoted 8 lines
Quoted 1 line

And for consistency, it would be good to do the same for gtk-doc.

This is odd: I fell over this because there was no gir created. Did not notice it was few lines below. Need to check that - maybe I am a bit off-sync to master or something is wrong elsewhere.

Will sync to master and send V2 then.

Finally had time to look into again. In the recipe there is

GI_DATA_ENABLED_armv7a = "False"
GI_DATA_ENABLED_armv7ve = "False"

=> My patch is wrong it overrides above accidentally - thanks Alex!

Since webkit builds gir fine (my machine is armv7ve) that does not seem necessary any more. I would like to send out a patch removing at least armv7ve - shall I take the risk to remove armv7a - maybe as two patches?

Andreas

#4 lore raw
Quoted 25 lines · Andreas Müller
Quoted 5 lines · Andreas Müller
Quoted 2 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic

from EXTRA_OECMAKE I think?

Quoted 2 lines
Quoted 2 lines

This line:

http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

Quoted 9 lines
Quoted 2 lines

And for consistency, it would be good to do the same for gtk-doc.

This is odd: I fell over this because there was no gir created. Did not notice it was few lines below. Need to check that - maybe I am a bit off-sync to master or something is wrong elsewhere.

Will sync to master and send V2 then.

Finally had time to look into again. In the recipe there is

GI_DATA_ENABLED_armv7a = "False"
GI_DATA_ENABLED_armv7ve = "False"

Quoted 6 lines

=> My patch is wrong it overrides above accidentally - thanks Alex!

Since webkit builds gir fine (my machine is armv7ve) that does not seem necessary any more. I would like to send out a patch removing at least armv7ve - shall I take the risk to remove armv7a - maybe as two patches?

Perhaps just the part you are
Confident about

Quoted 9 lines

Andreas
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw
Quoted 25 lines · Khem Raj
Quoted 23 lines · Andreas Müller
Quoted 8 lines · Andreas Müller
Quoted 5 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

Quoted 8 lines
Quoted 1 line

And for consistency, it would be good to do the same for gtk-doc.

This is odd: I fell over this because there was no gir created. Did not notice it was few lines below. Need to check that - maybe I am a bit off-sync to master or something is wrong elsewhere.

Will sync to master and send V2 then.

Finally had time to look into again. In the recipe there is

GI_DATA_ENABLED_armv7a = "False"
GI_DATA_ENABLED_armv7ve = "False"

Quoted 6 lines
Quoted 6 lines

=> My patch is wrong it overrides above accidentally - thanks Alex!

Since webkit builds gir fine (my machine is armv7ve) that does not seem necessary any more. I would like to send out a patch removing at least armv7ve - shall I take the risk to remove armv7a - maybe as two patches?

These two should be equivalent for all practical purposes and so should be updated together. ie remove them both, one patch.

#6 lore raw
Quoted 39 lines · Andre McCurdy
Quoted 30 lines · Khem Raj
Quoted 28 lines · Andreas Müller
Quoted 10 lines · Andreas Müller
Quoted 7 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

And for consistency, it would be good to do the same for gtk- doc.

Quoted 8 lines

This is odd: I fell over this because there was no gir created. Did
not notice it was few lines below. Need to check that - maybe I am a
bit off-sync to master or something is wrong elsewhere.

Will sync to master and send V2 then.

Finally had time to look into again. In the recipe there is

GI_DATA_ENABLED_armv7a = "False"
GI_DATA_ENABLED_armv7ve = "False"

=> My patch is wrong it overrides above accidentally - thanks Alex!

Quoted 7 lines
Quoted 7 lines

Since webkit builds gir fine (my machine is armv7ve) that does not
seem necessary any more. I would like to send out a patch removing at
least armv7ve - shall I take the risk to remove armv7a - maybe as two
patches?

Quoted 2 lines

These two should be equivalent for all practical purposes and so should be updated together. ie remove them both, one patch.

it will run user mode qemu underneath, which is not same for both, are you sure libraries and apps it will run are identical ?

#7 lore raw
Quoted 41 lines · Khem Raj
Quoted 39 lines · Andre McCurdy
Quoted 37 lines · Khem Raj
Quoted 35 lines · Andreas Müller
Quoted 10 lines · Andreas Müller
Quoted 7 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

And for consistency, it would be good to do the same for gtk- doc.

Quoted 8 lines

This is odd: I fell over this because there was no gir created. Did
not notice it was few lines below. Need to check that - maybe I am a
bit off-sync to master or something is wrong elsewhere.

Will sync to master and send V2 then.

Finally had time to look into again. In the recipe there is

GI_DATA_ENABLED_armv7a = "False"
GI_DATA_ENABLED_armv7ve = "False"

=> My patch is wrong it overrides above accidentally - thanks Alex!

Since webkit builds gir fine (my machine is armv7ve) that does not
seem necessary any more. I would like to send out a patch removing at
least armv7ve - shall I take the risk to remove armv7a - maybe as two
patches?

Quoted 5 lines
Quoted 2 lines

These two should be equivalent for all practical purposes and so should be updated together. ie remove them both, one patch.

it will run user mode qemu underneath, which is not same for both, are you sure libraries and apps it will run are identical ?

Binaries built for armv7ve will contain HW integer division instructions. Binaries build for armv7a will not.

That should have no impact on gobject-introspection.

There's a much bigger risk in letting these two build variants drift apart than there is from updating them together but only testing one.

#8 lore raw
Quoted 50 lines · Andre McCurdy
Quoted 49 lines · Khem Raj
Quoted 47 lines · Andre McCurdy
Quoted 33 lines · Khem Raj
Quoted 31 lines · Andreas Müller
Quoted 19 lines · Andreas Müller
Quoted 8 lines · Alexander Kanavin

You need to at the same time drop the introspection enablement logic from EXTRA_OECMAKE I think? This line:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb?h=master-next#n70

And for consistency, it would be good to do the same for gtk-
doc.

This is odd: I fell over this because there was no gir created.
Did
not notice it was few lines below. Need to check that - maybe I
am a
bit off-sync to master or something is wrong elsewhere.

Quoted 2 lines

Will sync to master and send V2 then.

Finally had time to look into again. In the recipe there is

GI_DATA_ENABLED_armv7a = "False"
GI_DATA_ENABLED_armv7ve = "False"

=> My patch is wrong it overrides above accidentally - thanks Alex!

Quoted 9 lines
Quoted 9 lines

Since webkit builds gir fine (my machine is armv7ve) that does
not
seem necessary any more. I would like to send out a patch removing at
least armv7ve - shall I take the risk to remove armv7a - maybe as
two
patches?

These two should be equivalent for all practical purposes and so should be updated together. ie remove them both, one patch.

Quoted 8 lines
Quoted 3 lines

it will run user mode qemu underneath, which is not same for both, are
you sure libraries and apps it will run are identical ?

Binaries built for armv7ve will contain HW integer division instructions. Binaries build for armv7a will not.

That should have no impact on gobject-introspection.

if it executes correctly. The reason why this was done in first place is that introspection app inside qemu either segfaulted or got hung.

Quoted 3 lines

There's a much bigger risk in letting these two build variants drift apart than there is from updating them together but only testing one.

qemu has failed in mysterious ways with slight differences in ISAs Not oppposed to doing it, All I am asking for is to try it before making the change.