Revert "Build OpenSSL 1.1.1 in snap"

This reverts commit 0e97ef992e.
This commit is contained in:
Ilya Fedin 2023-04-29 09:09:31 +04:00 committed by John Preston
parent 1ac0c4142d
commit 68e229640b

View File

@ -108,6 +108,7 @@ parts:
- libheif-dev - libheif-dev
- libopus-dev - libopus-dev
- libpulse-dev - libpulse-dev
- libssl-dev
- libwayland-dev - libwayland-dev
- libxcb1-dev - libxcb1-dev
- libxcb-keysyms1-dev - libxcb-keysyms1-dev
@ -120,6 +121,7 @@ parts:
- libheif1 - libheif1
- libopus0 - libopus0
- libpulse0 - libpulse0
- libssl3
- libwayland-client0 - libwayland-client0
- libwebkit2gtk-4.1-0 - libwebkit2gtk-4.1-0
- libxcb1 - libxcb1
@ -165,7 +167,6 @@ parts:
- glibmm - glibmm
- mozjpeg - mozjpeg
- openal - openal
- openssl
- protobuf - protobuf
- qt - qt
- rnnoise - rnnoise
@ -352,29 +353,6 @@ parts:
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
openssl:
source: https://github.com/openssl/openssl.git
source-depth: 1
source-branch: OpenSSL_1_1_1-stable
plugin: make
build-environment:
- LDFLAGS: -s
override-build: |
./config \
shared \
--prefix=/usr \
--openssldir=/usr/lib/ssl \
--libdir=lib/$CRAFT_ARCH_TRIPLET \
no-tests
craftctl default
prime:
- -./usr/bin
- -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a
- -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
- -./usr/share
protobuf: protobuf:
source: https://github.com/protocolbuffers/protobuf.git source: https://github.com/protocolbuffers/protobuf.git
source-depth: 1 source-depth: 1
@ -418,6 +396,7 @@ parts:
- libpcre2-dev - libpcre2-dev
- libpng-dev - libpng-dev
- libsm-dev - libsm-dev
- libssl-dev
- libvulkan-dev - libvulkan-dev
- libwayland-dev - libwayland-dev
- libx11-dev - libx11-dev
@ -455,6 +434,7 @@ parts:
- libpcre2-16-0 - libpcre2-16-0
- libpng16-16 - libpng16-16
- libsm6 - libsm6
- libssl3
- libvulkan1 - libvulkan1
- libwayland-client0 - libwayland-client0
- libwayland-cursor0 - libwayland-cursor0
@ -527,7 +507,6 @@ parts:
after: after:
- glibmm - glibmm
- mozjpeg - mozjpeg
- openssl
- patches - patches
rnnoise: rnnoise:
@ -566,6 +545,7 @@ parts:
- libopenh264-dev - libopenh264-dev
- libopus-dev - libopus-dev
- libpipewire-0.3-dev - libpipewire-0.3-dev
- libssl-dev
- libvpx-dev - libvpx-dev
- libx11-dev - libx11-dev
- libxcomposite-dev - libxcomposite-dev
@ -582,6 +562,7 @@ parts:
- libgl1 - libgl1
- libopenh264-6 - libopenh264-6
- libopus0 - libopus0
- libssl3
- libvpx7 - libvpx7
- libx11-6 - libx11-6
- libxcomposite1 - libxcomposite1
@ -604,4 +585,3 @@ parts:
- ffmpeg - ffmpeg
- glibmm - glibmm
- mozjpeg - mozjpeg
- openssl