Skip to contentSkip to conversation

xapp_xload: fix musl build

PATCH New Arnout Vandecappelle (Essensium/Mind) 2 participants 2 messages Nov 20, 2016 – Nov 21, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xapp_xload: fix musl build

xapp_xload tries to include protocols/rwhod.h, which isn't available on musl. Fortunately, the package also has stub code that can be enabled with -DRLOADSTUB (this is done e.g. on Cygwin).

This should probably be detected in configure, but that's a lot more work.

---
 package/x11r7/xapp_xload/xapp_xload.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/x11r7/xapp_xload/xapp_xload.mk +5 -0
index 1db0db5..364d247 100644
@@ -11,4 +11,9 @@ XAPP_XLOAD_LICENSE = MIT
 XAPP_XLOAD_LICENSE_FILES = COPYING
 XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+# musl doesn't have rwhod.h, but xload can replace it with stubs
+XAPP_XLOAD_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -DRLOADSTUB"
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.10.2
#1 lore raw

PATCH 1/1 xapp_xload: fix musl build

Hello,

Quoted 11 lines · Arnout Vandecappelle (Essensium/Mind)

xapp_xload tries to include protocols/rwhod.h, which isn't available on musl. Fortunately, the package also has stub code that can be enabled with -DRLOADSTUB (this is done e.g. on Cygwin).

This should probably be detected in configure, but that's a lot more work.

---
 package/x11r7/xapp_xload/xapp_xload.mk | 5 +++++
 1 file changed, 5 insertions(+)

You forgot a reference to the autobuilder failure, and I forgot as well before pushing :/

Applied to master anyway, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com