Skip to contentSkip to conversation

libwpe: remove rpi-specific custom code

PATCH In review Denys Dmytriyenko 2 participants 3 messages Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libwpe: remove rpi-specific custom code

This recipe was ported from another layer, which had special handling for rpi.

OE-Core doesn't have 'rpi' override, doesn't define 'vc4graphics' DISTRO_FEATURES and overall, BSP-specifics should be handled in downstream layers, not in OE-Core.

---
 meta/recipes-sato/webkit/libwpe_1.10.1.bb | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-sato/webkit/libwpe_1.10.1.bb +0 -3
index 22fff93..6f2fe1d 100644
@@ -6,9 +6,6 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
 DEPENDS = "virtual/egl libxkbcommon"
 
-# Workaround build issue with RPi userland EGL libraries.
-CFLAGS:append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
-
 inherit cmake features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
Signature · 1 line
2.7.4
#1 lore raw
Quoted 5 lines · Denys Dmytriyenko

This recipe was ported from another layer, which had special handling for rpi.

OE-Core doesn't have 'rpi' override, doesn't define 'vc4graphics' DISTRO_FEATURES and overall, BSP-specifics should be handled in downstream layers, not in OE-Core.

Thats fine, however, this will regress rpi BSPs, so either send a patch to add it via a bbappend to meta-raspberrypi or open a ticket so someone can get it done

Quoted 24 lines
---
  meta/recipes-sato/webkit/libwpe_1.10.1.bb | 3 ---
  1 file changed, 3 deletions(-)
meta/recipes-sato/webkit/libwpe_1.10.1.bb +0 -3
index 22fff93..6f2fe1d 100644
@@ -6,9 +6,6 @@ LICENSE = "BSD"
  LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
  DEPENDS = "virtual/egl libxkbcommon"
 
-# Workaround build issue with RPi userland EGL libraries.
-CFLAGS:append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
-
  inherit cmake features_check
 
  REQUIRED_DISTRO_FEATURES = "opengl"
#2 lore raw
Quoted 5 lines · Khem Raj
Quoted 2 lines · Denys Dmytriyenko

This recipe was ported from another layer, which had special handling for rpi.

Quoted 7 lines
Quoted 3 lines

OE-Core doesn't have 'rpi' override, doesn't define 'vc4graphics' DISTRO_FEATURES and overall, BSP-specifics should be handled in downstream layers, not in OE-Core.

Thats fine, however, this will regress rpi BSPs, so either send a patch to add it via a bbappend to meta-raspberrypi or open a ticket so someone can get it done

It has already regressed, as :append_rpi is not a correct override. Ticket open - https://github.com/agherzan/meta-raspberrypi/issues/893

Quoted 17 lines
Quoted 17 lines
---
 meta/recipes-sato/webkit/libwpe_1.10.1.bb | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-sato/webkit/libwpe_1.10.1.bb +0 -3
index 22fff93..6f2fe1d 100644
@@ -6,9 +6,6 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
 DEPENDS = "virtual/egl libxkbcommon"
-# Workaround build issue with RPi userland EGL libraries.
-CFLAGS:append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
-
 inherit cmake features_check
 REQUIRED_DISTRO_FEATURES = "opengl"