diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-07-22 19:17:11 +0530 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-07-22 17:24:19 +0100 |
| commit | 2abdfce53d43abde9d724827259f3d0a1b614fb6 (patch) | |
| tree | 41daf4e0f06d97e6bd60f7cb3c669ee976ee80a6 | |
| parent | b77b3c6521ff9d3825ac57db6d7564e0b2c4fc66 (diff) | |
openssl.recipe: Bump to 1.1.1k
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/720>
| -rw-r--r-- | recipes/openssl.recipe | 6 | ||||
| -rw-r--r-- | recipes/openssl/0001-Add-darwin64-arm64-cc-build-target.patch | 34 |
2 files changed, 2 insertions, 38 deletions
diff --git a/recipes/openssl.recipe b/recipes/openssl.recipe index dd1827c2..db3d68e8 100644 --- a/recipes/openssl.recipe +++ b/recipes/openssl.recipe @@ -8,11 +8,11 @@ class Recipe(recipe.Recipe): # Note: openssl helpfully moves tarballs somewhere else (old/x.y.z/) # whenever a new release comes out, so make sure to mirror to fdo when # bumping the release! - version = '1.1.1h' + version = '1.1.1k' licenses = [{License.OPENSSL: ['LICENSE']}] stype = SourceType.TARBALL url = 'https://ftp.openssl.org/source/{0}-{1}.tar.gz'.format(name, version) - tarball_checksum = '5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9' + tarball_checksum = '892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5' deps = ['ca-certificates', 'zlib'] # Parallel make fails randomly due to undefined macros, probably races allow_parallel_build = False @@ -31,8 +31,6 @@ class Recipe(recipe.Recipe): # https://github.com/openssl/openssl/pull/12400 'openssl/0001-crypto-win-Don-t-use-disallowed-APIs-on-UWP.patch', 'openssl/0002-win-onecore-Build-with-APPCONTAINER-for-UWP-compat.patch', - # https://github.com/openssl/openssl/pull/13476 '1.1.1i' - 'openssl/0001-Add-darwin64-arm64-cc-build-target.patch', ] files_bins = ['openssl'] diff --git a/recipes/openssl/0001-Add-darwin64-arm64-cc-build-target.patch b/recipes/openssl/0001-Add-darwin64-arm64-cc-build-target.patch deleted file mode 100644 index 697bf601..00000000 --- a/recipes/openssl/0001-Add-darwin64-arm64-cc-build-target.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c3ff8d3f7281d613b392e6b8574da5b7cd7275b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Felix=20Bu=CC=88nemann?= <felix.buenemann@gmail.com> -Date: Sun, 22 Nov 2020 23:06:06 +0100 -Subject: [PATCH] Add darwin64-arm64-cc build target - -This adds support for the Apple Silicon M1 hardware on macOS Big Sur. - -CLA: trivial ---- - Configurations/10-main.conf | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index eb92c24..cea4feb 100644 ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -1557,6 +1557,14 @@ my %targets = ( - bn_ops => "SIXTY_FOUR_BIT_LONG", - perlasm_scheme => "macosx", - }, -+ "darwin64-arm64-cc" => { -+ inherit_from => [ "darwin-common", asm("aarch64_asm") ], -+ CFLAGS => add("-Wall"), -+ cflags => add("-arch arm64"), -+ lib_cppflags => add("-DL_ENDIAN"), -+ bn_ops => "SIXTY_FOUR_BIT_LONG", -+ perlasm_scheme => "ios64", -+ }, - - ##### GNU Hurd - "hurd-x86" => { --- -2.23.0 - |