diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-10-19 10:12:41 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-10-19 10:12:41 +0100 |
commit | 10afe5f61585db3944c70808af36b74da09ae061 (patch) | |
tree | 8e736fa8af1cb2791edb0b06bcc03b0dc06f87ef /Makefile | |
parent | fab01f4f1a11e0e2db971247a3dd8e00ccb9bcbe (diff) | |
download | netsurf-10afe5f61585db3944c70808af36b74da09ae061.tar.gz netsurf-10afe5f61585db3944c70808af36b74da09ae061.tar.bz2 |
fix curl/openssl library link ordering
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -544,7 +544,10 @@ NETSURF_FEATURE_OPENSSL_CFLAGS := -DWITH_OPENSSL NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE NETSURF_FEATURE_NSPSL_CFLAGS := -DWITH_NSPSL -$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL)) +# libcurl and openssl ordering matters as if libcurl requires ssl it +# needs to come first in link order to ensure its symbols can be +# resolved by the subsequent openssl + # freemint does not support pkg-config for libcurl ifeq ($(HOST),mint) CFLAGS += $(shell curl-config --cflags) @@ -552,6 +555,7 @@ ifeq ($(HOST),mint) else $(eval $(call pkg_config_find_and_add_enabled,CURL,libcurl,Curl)) endif +$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL)) $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) |