diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd56dfbb91b85d3524e074fae62653757d5b0da0..0c1e57eee4b840dc6711186cf7330cc205684fac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ build linux meson wraps: services: !reference [.build-linux, services] before_script: - echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories - - apk update && apk add meson git python3 py3-pip py3-flask g++ cmake pkgconf openssl openssl-dev make + - apk update && apk add meson git g++ cmake pkgconf openssl openssl-dev make script: - meson setup builddir -Dtests=true -Dexamples=true -Ddefault_library=static - meson compile -C builddir diff --git a/subprojects/openssl.wrap b/subprojects/openssl.wrap index 3bf176e980647994c5d6d912ca40b9257a702ad1..4aaaba38d24414f2821a9bfb6820323f5ba716d1 100644 --- a/subprojects/openssl.wrap +++ b/subprojects/openssl.wrap @@ -1,9 +1,14 @@ [wrap-file] -directory = openssl-1.1.1k +directory = openssl-1.1.1l +source_url = https://www.openssl.org/source/openssl-1.1.1l.tar.gz +source_filename = openssl-1.1.1l.tar.gz +source_hash = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 +patch_filename = openssl_1.1.1l-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/openssl_1.1.1l-1/get_patch +patch_hash = 670db31580039e06c17f48bcd31e489f453fe72c22006de6d693b9b033f1003a -source_url = https://www.openssl.org/source/openssl-1.1.1k.tar.gz -source_filename = openssl-1.1.1k.tar.gz -source_hash = 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 - -patch_directory = openssl-meson +[provide] +libcrypto = libcrypto_dep +libssl = libssl_dep +openssl = openssl_dep diff --git a/subprojects/packagefiles/openssl-meson/meson.build b/subprojects/packagefiles/openssl-meson/meson.build deleted file mode 100644 index a1db8cdcadbefee9591d8ba147966eeaf92e54c4..0000000000000000000000000000000000000000 --- a/subprojects/packagefiles/openssl-meson/meson.build +++ /dev/null @@ -1,21 +0,0 @@ -project('Openssl meson wrapper', 'c', - meson_version : '>=0.55.0', - version: '1.1.1k', -) - -mod = import('unstable_external_project') - -openssl = mod.add_project('Configure', - configure_options : [ - '--prefix=@PREFIX@', - '--libdir=@LIBDIR@', - '-Dincludedir_ignore=@PREFIX@/@INCLUDEDIR@', - target_machine.system() + '-' + target_machine.cpu_family(), - ], - verbose: true, -) - -ssl_dep = openssl.dependency('ssl') -crypto_dep = openssl.dependency('crypto') -openssl_dep = declare_dependency(dependencies: [ssl_dep, crypto_dep]) -meson.override_dependency('openssl', ssl_dep)