summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-09-24 12:16:17 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-24 12:16:17 (GMT)
commit3cf5b3019118cdc980666d7a1ccfd29f658d0261 (patch)
treeccb4c128a409106cc63f4fa9657e3bf4bb8eee4f
parenteb8208bf1d5420bef2eddaa6dc6a7a3eb8a6cf37 (diff)
downloadbuildroot-3cf5b3019118cdc980666d7a1ccfd29f658d0261.tar.gz
buildroot-3cf5b3019118cdc980666d7a1ccfd29f658d0261.tar.bz2
civetweb: fix static linking with openssl
Fixes http://autobuild.buildroot.net/results/acf/acfefc4f0f23ef646094ec427c9502eab7b86736/ Corrects a number of issues with the openssl handling: - Libraries have to be listed after the object files using them, so pass openssl linker statements in LIBS rather than COPT - Openssl support library is libcrypto, not libcrypt - Openssl need zlib Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/civetweb/civetweb.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index e468563..171ad0c 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -11,6 +11,7 @@ CIVETWEB_LICENSE_FILES = LICENSE.md
CIVETWEB_CONF_OPT = TARGET_OS=LINUX
CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
+CIVETWEB_LIBS = -lpthread -lm -ldl
CIVETWEB_SYSCONFDIR = /etc
CIVETWEB_HTMLDIR = /var/www
@@ -27,7 +28,8 @@ ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- CIVETWEB_COPT += -DNO_SSL_DL -lcrypt -lssl
+ CIVETWEB_COPT += -DNO_SSL_DL
+ CIVETWEB_LIBS += -lssl -lcrypto -lz
CIVETWEB_DEPENDENCIES += openssl
else
CIVETWEB_COPT += -DNO_SSL
@@ -36,7 +38,7 @@ endif
define CIVETWEB_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \
$(CIVETWEB_CONF_OPT) \
- COPT="$(CIVETWEB_COPT)"
+ COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
endef
define CIVETWEB_INSTALL_TARGET_CMDS