aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-14 18:55:38 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-07-24 18:57:36 +0200
commit11e8768c21f489fdd231865a5fc9def88f8da121 (patch)
treecf886d790aa390bc07d63ca92d85b4fe55102d46 /meta-webserver
parent83814ebd809f2686a5580bf4e73e31a6607c9340 (diff)
downloadmeta-openembedded-contrib-11e8768c21f489fdd231865a5fc9def88f8da121.tar.gz
meta-openembedded-contrib-11e8768c21f489fdd231865a5fc9def88f8da121.tar.bz2
meta-openembedded-contrib-11e8768c21f489fdd231865a5fc9def88f8da121.zip
monkey: Link in libexecinfo on musl
Needed for backtrace() APIs Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch29
-rw-r--r--meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb9
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch b/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
new file mode 100644
index 0000000000..7a229513b6
--- /dev/null
+++ b/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
@@ -0,0 +1,29 @@
+From b0526a9b5325bd4758dad8d14efd85c98ef2ebff Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 14 Jul 2017 18:25:23 -0700
+Subject: [PATCH] configure: Respect LIBS variable from env
+
+For musl we need to pass -lexecinfo from env
+this change accomodates that
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 4286c34..f1c65db 100755
+--- a/configure
++++ b/configure
+@@ -620,7 +620,7 @@ LIBDEFS = -DSHAREDLIB -fPIC \$(DEFS)
+ INCDIR = ./include
+ LDFLAGS = $LDFLAGS
+ DESTDIR = ../bin/monkey
+-LIBS = -ldl $libs
++LIBS = -ldl $libs ${LIBS}
+ OBJ = monkey.o mk_method.o mk_mimetype.o mk_vhost.o mk_request.o \\
+ mk_header.o mk_config.o mk_signals.o \\
+ mk_user.o mk_utils.o mk_epoll.o mk_scheduler.o \\
+--
+2.13.3
+
diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
index be8ed37b97..97dc2769a3 100644
--- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
@@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
SECTION = "net"
+DEPENDS_append_libc-musl = " libexecinfo"
+
SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \
+ file://0001-configure-Respect-LIBS-variable-from-env.patch \
file://monkey.service \
file://monkey.init"
@@ -24,7 +27,13 @@ EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \
--disable-plugins=mbedtls \
--debug \
--malloc-libc"
+
+do_configure_prepend_libc-musl() {
+ export LIBS="-lexecinfo"
+}
+
DISABLE_STATIC = ""
+CLEANBROKEN = "1"
inherit autotools-brokensep pkgconfig update-rc.d systemd