Skip to contentSkip to conversation

webkitgtk: fix reconfigure

PATCH In review Andreas Müller 2 participants 3 messages Feb 20, 2020 – Feb 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 webkitgtk: fix reconfigure

| ln: failed to create symbolic link '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/webkitgtk/2.26.4-r0/recipe-sysroot-native/usr/bin/python': File exists

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +3 -1
index 585723772e..fa109446d1 100644
@@ -61,7 +61,9 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
 # webkitgtk is full of /usr/bin/env python, particular for generating docs
 do_configure[postfuncs] += "setup_python_link"
 setup_python_link() {
-	ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python
+	if [ ! -e ${STAGING_BINDIR_NATIVE}/python ]; then
+		ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python
+	fi
 }
 
 EXTRA_OECMAKE = " \
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 webkitgtk: enable gobject-introspection for armv7ve - it builds without issues

Maybe armv7a can be re-enabled either but due to limited resources there is no chance for me to test.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
index fa109446d1..a1dba73c51 100644
@@ -127,7 +127,6 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb"
 # qemu: uncaught target signal 11 (Segmentation fault) - core dumped
 # Segmentation fault
 GI_DATA_ENABLED_armv7a = "False"
-GI_DATA_ENABLED_armv7ve = "False"
 
 # Can't be built with ccache
 CCACHE_DISABLE = "1"
Signature · 1 line
2.21.0
#2 lore raw

Re: [PATCH 2/2][master-next] webkitgtk: enable gobject-introspection for armv7ve - it builds without issues

Quoted 14 lines · Andreas Müller

Maybe armv7a can be re-enabled either but due to limited resources there is no chance for me to test.

---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -0
index fa109446d1..a1dba73c51 100644

meta/recipes-sato/webkit/webkitgtk_2.26.4.bb ARM_INSTRUCTION_SET_armv7ve = "thumb" · line 130

Quoted 4 lines
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
@@ -127,7 +127,6 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb"
 # qemu: uncaught target signal 11 (Segmentation fault) - core dumped
 # Segmentation fault
 GI_DATA_ENABLED_armv7a = "False"
-GI_DATA_ENABLED_armv7ve = "False"

Introspection is now hanging forever in qemu-arm when building with musl. Perhaps just turn them into

GI_DATA_ENABLED_armv7a_libc-musl = "False" please

Quoted 11 lines
meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +0 -1
 # Can't be built with ccache
 CCACHE_DISABLE = "1"
--

2.21.0

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