Skip to contentSkip to conversation

prosody: fix build with musl libc

PATCH New Baruch Siach 2 participants 4 messages Apr 3, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 prosody: fix build with musl libc

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 <[email protected]>
Cc Francois Perrad <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/prosody/prosody.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/prosody/prosody.mk +4 -1
index c5a83081dcfa..d95578253d6d 100644
@@ -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 \
Signature · 1 line
2.16.2
author
#1 lore raw

PATCH 2/2 prosody: needs MMU

prosody POSIX support code calls fork() unconditionally.

prosody also uses the mallinfo() API, but uClibc does not provide that for no-MMU targets.

Fixes:
http://autobuild.buildroot.net/results/2d0/2d0f97e41cc1d4c9c7a0eacd4eec8bad6f00bcff/
http://autobuild.buildroot.net/results/f69/f69dfb1a7d1163b402b1f9bef045891c229539e5/

Cc Dushara Jayasinghe <[email protected]>
Cc Francois Perrad <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/prosody/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/prosody/Config.in +2 -0
index 1bc79b7f2a78..ef26e2750b66 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PROSODY
 	bool "prosody"
+	depends on BR2_USE_MMU # fork
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_LUAEXPAT # runtime
 	select BR2_PACKAGE_LUASEC # runtime

@@ -16,3 +17,4 @@ config BR2_PACKAGE_PROSODY
 
 comment "prosody needs the lua interpreter"
 	depends on !BR2_PACKAGE_HAS_LUAINTERPRETER
+	depends on BR2_USE_MMU
Signature · 1 line
2.16.2
#2 lore raw

PATCH 2/2 prosody: needs MMU

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

prosody POSIX support code calls fork() unconditionally. prosody also uses the mallinfo() API, but uClibc does not provide that for no-MMU targets.

Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/2d0/2d0f97e41cc1d4c9c7a0eacd4eec8bad6f00bcff/
http://autobuild.buildroot.net/results/f69/f69dfb1a7d1163b402b1f9bef045891c229539e5/

Cc Dushara Jayasinghe <[email protected]>
Cc Francois Perrad <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed, thanks.

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

PATCH 1/2 prosody: fix build with musl libc

In reply to Baruch Siach
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

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

Quoted 8 lines

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 <[email protected]>
Cc Francois Perrad <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard