diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-07-14 18:55:38 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-24 18:57:36 +0200 |
| commit | 11e8768c21f489fdd231865a5fc9def88f8da121 (patch) | |
| tree | cf886d790aa390bc07d63ca92d85b4fe55102d46 | |
| parent | 83814ebd809f2686a5580bf4e73e31a6607c9340 (diff) | |
| download | meta-openembedded-11e8768c21f489fdd231865a5fc9def88f8da121.tar.gz | |
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>
| -rw-r--r-- | meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch | 29 | ||||
| -rw-r--r-- | meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb | 9 |
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 @@ | |||
| 1 | From b0526a9b5325bd4758dad8d14efd85c98ef2ebff Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 14 Jul 2017 18:25:23 -0700 | ||
| 4 | Subject: [PATCH] configure: Respect LIBS variable from env | ||
| 5 | |||
| 6 | For musl we need to pass -lexecinfo from env | ||
| 7 | this change accomodates that | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | configure | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/configure b/configure | ||
| 15 | index 4286c34..f1c65db 100755 | ||
| 16 | --- a/configure | ||
| 17 | +++ b/configure | ||
| 18 | @@ -620,7 +620,7 @@ LIBDEFS = -DSHAREDLIB -fPIC \$(DEFS) | ||
| 19 | INCDIR = ./include | ||
| 20 | LDFLAGS = $LDFLAGS | ||
| 21 | DESTDIR = ../bin/monkey | ||
| 22 | -LIBS = -ldl $libs | ||
| 23 | +LIBS = -ldl $libs ${LIBS} | ||
| 24 | OBJ = monkey.o mk_method.o mk_mimetype.o mk_vhost.o mk_request.o \\ | ||
| 25 | mk_header.o mk_config.o mk_signals.o \\ | ||
| 26 | mk_user.o mk_utils.o mk_epoll.o mk_scheduler.o \\ | ||
| 27 | -- | ||
| 28 | 2.13.3 | ||
| 29 | |||
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" | |||
| 7 | 7 | ||
| 8 | SECTION = "net" | 8 | SECTION = "net" |
| 9 | 9 | ||
| 10 | DEPENDS_append_libc-musl = " libexecinfo" | ||
| 11 | |||
| 10 | SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ | 12 | SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ |
| 13 | file://0001-configure-Respect-LIBS-variable-from-env.patch \ | ||
| 11 | file://monkey.service \ | 14 | file://monkey.service \ |
| 12 | file://monkey.init" | 15 | file://monkey.init" |
| 13 | 16 | ||
| @@ -24,7 +27,13 @@ EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ | |||
| 24 | --disable-plugins=mbedtls \ | 27 | --disable-plugins=mbedtls \ |
| 25 | --debug \ | 28 | --debug \ |
| 26 | --malloc-libc" | 29 | --malloc-libc" |
| 30 | |||
| 31 | do_configure_prepend_libc-musl() { | ||
| 32 | export LIBS="-lexecinfo" | ||
| 33 | } | ||
| 34 | |||
| 27 | DISABLE_STATIC = "" | 35 | DISABLE_STATIC = "" |
| 36 | CLEANBROKEN = "1" | ||
| 28 | 37 | ||
| 29 | inherit autotools-brokensep pkgconfig update-rc.d systemd | 38 | inherit autotools-brokensep pkgconfig update-rc.d systemd |
| 30 | 39 | ||
