Skip to contentSkip to conversation

package/wpewebkit: add optional systemd dependency

PATCH New Adrian Perez de Castro 3 participants 4 messages Nov 10, 2020 – Nov 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/wpewebkit: add optional systemd dependency

WPE WebKit 2.30.0 added an USE_SYSTEMD buil option, which needs to be set to avoid CMake from trying to use systemd unconditionally.

Based on a similar patch for package/webkitgtk by Peter Seiderer.

---
 package/wpewebkit/wpewebkit.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wpewebkit/wpewebkit.mk +7 -0
index 6233505ca7..6f83775e96 100644
@@ -63,6 +63,13 @@ else
 WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON
+WPEWEBKIT_DEPENDENCIES += systemd
+else
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF
+endif
+
 # JIT is not supported for MIPS r6, but the WebKit build system does not
 # have a check for these processors. The same goes for ARMv5 and ARMv6.
 # Disable JIT forcibly here and use the CLoop interpreter instead.
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/wpewebkit: add optional systemd dependency

Hello Adrian,

Quoted 18 lines · Adrian Perez de Castro

WPE WebKit 2.30.0 added an USE_SYSTEMD buil option, which needs to be set to avoid CMake from trying to use systemd unconditionally.

Based on a similar patch for package/webkitgtk by Peter Seiderer.

---
 package/wpewebkit/wpewebkit.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wpewebkit/wpewebkit.mk +0 -0
index 6233505ca7..6f83775e96 100644
@@ -63,6 +63,13 @@ else
 WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF
 endif
 

package/wpewebkit/wpewebkit.mk else · line 75

Quoted 10 lines
package/wpewebkit/wpewebkit.mk +7 -0
+ifeq ($(BR2_INIT_SYSTEMD),y)
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON
+WPEWEBKIT_DEPENDENCIES += systemd
+else
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF
+endif
+
 # JIT is not supported for MIPS r6, but the WebKit build system does not
 # have a check for these processors. The same goes for ARMv5 and ARMv6.
 # Disable JIT forcibly here and use the CLoop interpreter instead.

Note: the status for this patch in patchwork is 'Superseded' [1] (by mistake?)...

Regards,
Peter

[1] https://patchwork.ozlabs.org/project/buildroot/patch/20201110090204.1581432-1-aperez at igalia.com/

#2 lore raw

PATCH 1/1 package/wpewebkit: add optional systemd dependency

Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Hello Adrian,

Quoted 18 lines · Adrian Perez de Castro

WPE WebKit 2.30.0 added an USE_SYSTEMD buil option, which needs to be set to avoid CMake from trying to use systemd unconditionally.

Based on a similar patch for package/webkitgtk by Peter Seiderer.

---
package/wpewebkit/wpewebkit.mk | 7 +++++++

1 file changed, 7 insertions(+)
package/wpewebkit/wpewebkit.mk +0 -0
index 6233505ca7..6f83775e96 100644
@@ -63,6 +63,13 @@ else

WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF
endif

Quoted 12 lines
Quoted 10 lines
package/wpewebkit/wpewebkit.mk +7 -0
+ifeq ($(BR2_INIT_SYSTEMD),y)
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON
+WPEWEBKIT_DEPENDENCIES += systemd
+else
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF
+endif
+

# JIT is not supported for MIPS r6, but the WebKit build system does not

# have a check for these processors. The same goes for ARMv5 and ARMv6.
# Disable JIT forcibly here and use the CLoop interpreter instead.

Committed, thanks.

Quoted 1 line

Note: the status for this patch in patchwork is 'Superseded' [1] (by mistake?)...

I got confused with webkitgtk/wpewebkit and thought it was identical to your patch, sorry.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 package/wpewebkit: add optional systemd dependency

Hello,

Quoted 36 lines · On Tue, 10 Nov 2020 23:19:58 +0100 Peter Korsgaard <[email protected]> wrote:
Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Hello Adrian,

Quoted 18 lines · Adrian Perez de Castro

WPE WebKit 2.30.0 added an USE_SYSTEMD buil option, which needs to be set to avoid CMake from trying to use systemd unconditionally.

Based on a similar patch for package/webkitgtk by Peter Seiderer.

---
package/wpewebkit/wpewebkit.mk | 7 +++++++

1 file changed, 7 insertions(+)
package/wpewebkit/wpewebkit.mk +0 -0
index 6233505ca7..6f83775e96 100644
@@ -63,6 +63,13 @@ else

WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF
endif

Quoted 12 lines
Quoted 10 lines
package/wpewebkit/wpewebkit.mk +7 -0
+ifeq ($(BR2_INIT_SYSTEMD),y)
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON
+WPEWEBKIT_DEPENDENCIES += systemd
+else
+WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF
+endif
+

# JIT is not supported for MIPS r6, but the WebKit build system does not

# have a check for these processors. The same goes for ARMv5 and ARMv6.
# Disable JIT forcibly here and use the CLoop interpreter instead.
Quoted 6 lines

Committed, thanks.

Quoted 1 line

Note: the status for this patch in patchwork is 'Superseded' [1] (by mistake?)...

I got confused with webkitgtk/wpewebkit and thought it was identical to your patch, sorry.

No worries, it could happen to anyone. I can see how it's easy to mix both wpewebkit and webkitgtk, specially when there are patches that we need for both ^_^

Cheers,
-Adri?n
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201111/5654b4a1/attachment.asc>