first approach to get HTTPS in libcurl work
1. libcurl.mk now changed to build against static openssl from deps. 2. but, it won't work with openssl 1.1.1a, bcz of SSL: couldn't create a context: error:00000000:lib(0):func(0):reason(0) , so, in test i decided to upgrade openssl to 1.1.1b. 3. original openssl.mk was with many disabled features, i enable all of them, of course it's don't needed and we need to leave only SSL/TLS things enabled in OpenSSL build. 4. probably i broke something in Windows and MacOS build. This commit is only first approach to continue work.
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
package=libcurl
|
package=libcurl
|
||||||
$(package)_version=7.54.0
|
$(package)_version=7.64.1
|
||||||
|
$(package)_dependencies=openssl
|
||||||
$(package)_download_path=https://curl.haxx.se/download
|
$(package)_download_path=https://curl.haxx.se/download
|
||||||
$(package)_file_name=curl-$($(package)_version).tar.gz
|
$(package)_file_name=curl-$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=a84b635941c74e26cce69dd817489bec687eb1f230e7d1897fc5b5f108b59adf
|
$(package)_sha256_hash=432d3f466644b9416bc5b649d344116a753aeaa520c8beaf024a90cba9d3d35d
|
||||||
$(package)_config_opts_linux=--disable-shared --enable-static --prefix=$(host_prefix)
|
$(package)_config_opts_linux=--disable-shared --enable-static --prefix=$(host_prefix) --host=x86_64-unknown-linux-gnu
|
||||||
$(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --prefix=$(host_prefix) --host=x86_64-w64-mingw32
|
$(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --prefix=$(host_prefix) --host=x86_64-w64-mingw32
|
||||||
$(package)_config_opts_darwin=--disable-shared --enable-static --prefix=$(host_prefix)
|
$(package)_config_opts_darwin=--disable-shared --enable-static --prefix=$(host_prefix)
|
||||||
$(package)_cflags_darwin=-mmacosx-version-min=10.9
|
$(package)_cflags_darwin=-mmacosx-version-min=10.9
|
||||||
@@ -15,11 +16,21 @@ define $(package)_set_vars
|
|||||||
endef
|
endef
|
||||||
endif
|
endif
|
||||||
|
|
||||||
define $(package)_config_cmds
|
ifeq ($(build_os),linux)
|
||||||
$($(package)_conf_tool) $($(package)_config_opts)
|
define $(package)_set_vars
|
||||||
|
$(package)_config_env=LD_LIBRARY_PATH="$(host_prefix)/lib" PKG_CONFIG_LIBDIR="$(host_prefix)/lib/pkgconfig" CPPFLAGS="-I$(host_prefix)/include" LDFLAGS="-L$(host_prefix)/lib"
|
||||||
endef
|
endef
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
define $(package)_config_cmds
|
||||||
|
echo '=== config for $(package):' && \
|
||||||
|
echo '$($(package)_config_env) $($(package)_conf_tool) $($(package)_config_opts)' && \
|
||||||
|
sleep 10 && \
|
||||||
|
echo '=== ' && \
|
||||||
|
$($(package)_config_env) $($(package)_conf_tool) $($(package)_config_opts)
|
||||||
|
endef
|
||||||
|
|
||||||
ifeq ($(build_os),darwin)
|
ifeq ($(build_os),darwin)
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
$(MAKE) CPPFLAGS='-fPIC' CFLAGS='-mmacosx-version-min=10.9'
|
$(MAKE) CPPFLAGS='-fPIC' CFLAGS='-mmacosx-version-min=10.9'
|
||||||
@@ -31,5 +42,7 @@ endef
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
define $(package)_stage_cmds
|
||||||
|
echo 'Staging dir: $($(package)_staging_dir)$(host_prefix)/' && \
|
||||||
|
sleep 10 && \
|
||||||
$(MAKE) DESTDIR=$($(package)_staging_dir) install
|
$(MAKE) DESTDIR=$($(package)_staging_dir) install
|
||||||
endef
|
endef
|
||||||
|
|||||||
@@ -1,81 +1,13 @@
|
|||||||
package=openssl
|
package=openssl
|
||||||
$(package)_version=1.1.1a
|
$(package)_version=1.1.1b
|
||||||
$(package)_download_path=https://www.openssl.org/source
|
$(package)_download_path=https://www.openssl.org/source
|
||||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41
|
$(package)_sha256_hash=5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
|
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
|
||||||
$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
|
$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
|
||||||
$(package)_config_opts+=no-afalgeng
|
|
||||||
$(package)_config_opts+=no-asm
|
|
||||||
$(package)_config_opts+=no-async
|
|
||||||
$(package)_config_opts+=no-bf
|
|
||||||
$(package)_config_opts+=no-blake2
|
|
||||||
$(package)_config_opts+=no-camellia
|
|
||||||
$(package)_config_opts+=no-capieng
|
|
||||||
$(package)_config_opts+=no-cast
|
|
||||||
$(package)_config_opts+=no-chacha
|
|
||||||
$(package)_config_opts+=no-cmac
|
|
||||||
$(package)_config_opts+=no-cms
|
|
||||||
$(package)_config_opts+=no-comp
|
|
||||||
$(package)_config_opts+=no-crypto-mdebug
|
|
||||||
$(package)_config_opts+=no-crypto-mdebug-backtrace
|
|
||||||
$(package)_config_opts+=no-ct
|
|
||||||
$(package)_config_opts+=no-des
|
|
||||||
$(package)_config_opts+=no-dgram
|
|
||||||
$(package)_config_opts+=no-dsa
|
|
||||||
$(package)_config_opts+=no-dso
|
|
||||||
$(package)_config_opts+=no-dtls
|
|
||||||
$(package)_config_opts+=no-dtls1
|
|
||||||
$(package)_config_opts+=no-dtls1-method
|
|
||||||
$(package)_config_opts+=no-dynamic-engine
|
|
||||||
$(package)_config_opts+=no-ec2m
|
|
||||||
$(package)_config_opts+=no-ec_nistp_64_gcc_128
|
|
||||||
$(package)_config_opts+=no-egd
|
|
||||||
$(package)_config_opts+=no-engine
|
|
||||||
$(package)_config_opts+=no-err
|
|
||||||
$(package)_config_opts+=no-gost
|
|
||||||
$(package)_config_opts+=no-heartbeats
|
|
||||||
$(package)_config_opts+=no-idea
|
|
||||||
$(package)_config_opts+=no-md2
|
|
||||||
$(package)_config_opts+=no-md4
|
|
||||||
$(package)_config_opts+=no-mdc2
|
|
||||||
$(package)_config_opts+=no-multiblock
|
|
||||||
$(package)_config_opts+=no-nextprotoneg
|
|
||||||
$(package)_config_opts+=no-ocb
|
|
||||||
$(package)_config_opts+=no-ocsp
|
|
||||||
$(package)_config_opts+=no-poly1305
|
|
||||||
$(package)_config_opts+=no-posix-io
|
|
||||||
$(package)_config_opts+=no-psk
|
|
||||||
$(package)_config_opts+=no-rc2
|
|
||||||
$(package)_config_opts+=no-rc4
|
|
||||||
$(package)_config_opts+=no-rc5
|
|
||||||
$(package)_config_opts+=no-rdrand
|
|
||||||
$(package)_config_opts+=no-rfc3779
|
|
||||||
$(package)_config_opts+=no-rmd160
|
|
||||||
$(package)_config_opts+=no-scrypt
|
|
||||||
$(package)_config_opts+=no-sctp
|
|
||||||
$(package)_config_opts+=no-seed
|
|
||||||
$(package)_config_opts+=no-shared
|
$(package)_config_opts+=no-shared
|
||||||
$(package)_config_opts+=no-sock
|
|
||||||
$(package)_config_opts+=no-srp
|
|
||||||
$(package)_config_opts+=no-srtp
|
|
||||||
$(package)_config_opts+=no-ssl
|
|
||||||
$(package)_config_opts+=no-ssl3
|
|
||||||
$(package)_config_opts+=no-ssl3-method
|
|
||||||
$(package)_config_opts+=no-ssl-trace
|
|
||||||
$(package)_config_opts+=no-stdio
|
|
||||||
$(package)_config_opts+=no-tls
|
|
||||||
$(package)_config_opts+=no-tls1
|
|
||||||
$(package)_config_opts+=no-tls1-method
|
|
||||||
$(package)_config_opts+=no-ts
|
|
||||||
$(package)_config_opts+=no-ui
|
|
||||||
$(package)_config_opts+=no-unit-test
|
|
||||||
$(package)_config_opts+=no-weak-ssl-ciphers
|
|
||||||
$(package)_config_opts+=no-whirlpool
|
|
||||||
$(package)_config_opts+=no-zlib
|
|
||||||
$(package)_config_opts+=no-zlib-dynamic
|
|
||||||
$(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
|
$(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
|
||||||
$(package)_config_opts+=-DPURIFY
|
$(package)_config_opts+=-DPURIFY
|
||||||
$(package)_config_opts_linux=-fPIC -Wa,--noexecstack
|
$(package)_config_opts_linux=-fPIC -Wa,--noexecstack
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ native_packages := native_ccache
|
|||||||
wallet_packages=bdb
|
wallet_packages=bdb
|
||||||
|
|
||||||
ifeq ($(host_os),linux)
|
ifeq ($(host_os),linux)
|
||||||
packages := boost openssl libevent zeromq $(zcash_packages) googletest #googlemock
|
packages := boost openssl libevent zeromq $(zcash_packages) googletest libcurl #googlemock
|
||||||
else
|
else
|
||||||
packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock
|
packages := boost openssl libevent zeromq $(zcash_packages) libcurl googletest #googlemock
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user