Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mtxclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
mtxclient
Commits
66aab172
Verified
Commit
66aab172
authored
3 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Use official openssl wrap
parent
b7c485da
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
subprojects/openssl.wrap
+11
-6
11 additions, 6 deletions
subprojects/openssl.wrap
subprojects/packagefiles/openssl-meson/meson.build
+0
-21
0 additions, 21 deletions
subprojects/packagefiles/openssl-meson/meson.build
with
12 additions
and
28 deletions
.gitlab-ci.yml
+
1
−
1
View file @
66aab172
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
subprojects/openssl.wrap
+
11
−
6
View file @
66aab172
[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
This diff is collapsed.
Click to expand it.
subprojects/packagefiles/openssl-meson/meson.build
deleted
100644 → 0
+
0
−
21
View file @
b7c485da
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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment