Commit 3cf5b301 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent eb8208bf

package/civetweb/civetweb.mk

+4 −2
Original line number Diff line number Diff line
@@ -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