[Buildroot] [git commit] prosody: fix build with musl libc

Peter Korsgaard peter at korsgaard.com
Tue Apr 3 13:45:06 UTC 2018


commit: https://git.buildroot.net/buildroot/commit/?id=286a81d7a267488a78c9fb85159fe8d85fa2bd76
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

musl libc does not provide the mallinfo() API. Define WITHOUT_MALLINFO
to skip the code using it.

Fixes:
http://autobuild.buildroot.net/results/42c/42cd6e3be761d1cb358bc50acd7fa58c8aa1c750/
http://autobuild.buildroot.net/results/29d/29d8dcbe013e549a865c0c5953272dab1fe5f777/
http://autobuild.buildroot.net/results/a6d/a6deb7440f80b072432c0f9c048e59abe4edf1c0/

Cc: Dushara Jayasinghe <nidujay at gmail.com>
Cc: Francois Perrad <francois.perrad at gadz.org>
Signed-off-by: Baruch Siach <baruch at tkos.co.il>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/prosody/prosody.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk
index c5a83081dc..d95578253d 100644
--- a/package/prosody/prosody.mk
+++ b/package/prosody/prosody.mk
@@ -10,12 +10,15 @@ PROSODY_LICENSE = MIT
 PROSODY_LICENSE_FILES = COPYING
 PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl
 
+PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \
+	$(if BR2_TOOLCHAIN_USES_MUSL,-DWITHOUT_MALLINFO)
+
 PROSODY_CONF_OPTS = \
 	--with-lua-bin=$(HOST_DIR)/usr/bin \
 	--with-lua=$(STAGING_DIR)/usr \
 	--lua-version=$(LUAINTERPRETER_ABIVER) \
 	--c-compiler=$(TARGET_CC) \
-	--cflags="$(TARGET_CFLAGS) -fPIC -std=c99" \
+	--cflags="$(PROSODY_CFLAGS)" \
 	--linker=$(TARGET_CC) \
 	--ldflags="$(TARGET_LDFLAGS) -shared" \
 	--sysconfdir=/etc/prosody \


More information about the buildroot mailing list