From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] libevent: drop openssl static linking workaround
Date: Thu, 9 Feb 2017 11:29:52 +0100 [thread overview]
Message-ID: <20170209102952.6351-2-peter@korsgaard.com> (raw)
In-Reply-To: <20170209102952.6351-1-peter@korsgaard.com>
Commit f29bb169cf (libevent: fix openssl detection when statically linking)
forced libevent to link against zlib when statically linking against openssl
as the configure script failed to do this.
Since then libevent has been bumped, and it now uses pkg-config to figure
out how to link with openssl, so ensure pkg-config is available and drop the
now-unneeded workaround.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/libevent/libevent.mk | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 128bb2ac7..5458ce316 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -24,13 +24,8 @@ LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBEVENT_DEPENDENCIES += openssl
+LIBEVENT_DEPENDENCIES += host-pkgconf openssl
LIBEVENT_CONF_OPTS += --enable-openssl
-# openssl needs zlib but configure forgets to link against it causing
-# openssl detection to fail
-ifeq ($(BR2_STATIC_LIBS),y)
-LIBEVENT_CONF_ENV += OPENSSL_LIBADD='-lz'
-endif
else
LIBEVENT_CONF_OPTS += --disable-openssl
endif
--
2.11.0
next prev parent reply other threads:[~2017-02-09 10:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 10:29 [Buildroot] [PATCH 1/2] libevent: disable sample programs to workaround static linking issue Peter Korsgaard
2017-02-09 10:29 ` Peter Korsgaard [this message]
2017-02-09 14:02 ` [Buildroot] [PATCH 2/2] libevent: drop openssl static linking workaround Peter Korsgaard
2017-02-09 14:02 ` [Buildroot] [PATCH 1/2] libevent: disable sample programs to workaround static linking issue Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170209102952.6351-2-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox