SHA256
8
0
forked from pool/boringssl

Accepting request 783534 from home:Guillaume_G:branches:openSUSE:Factory:ARM

- Fix arm build:
  * 0005-fix-alignment-for-arm.patch

OBS-URL: https://build.opensuse.org/request/show/783534
OBS-URL: https://build.opensuse.org/package/show/security:tls/boringssl?expand=0&rev=28
This commit is contained in:
Tomáš Chvátal
2020-03-10 21:38:59 +00:00
committed by Git OBS Bridge
parent 8e1807718e
commit be0ff33ecb
3 changed files with 34 additions and 2 deletions
+6
View File
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 10 20:00:43 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Fix arm build:
* 0005-fix-alignment-for-arm.patch
-------------------------------------------------------------------
Wed Dec 4 07:55:10 UTC 2019 - Klaus Kämpf <kkaempf@suse.com>
+4 -2
View File
@@ -1,7 +1,7 @@
#
# spec file for package boringssl
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,12 +29,13 @@ Patch1: 0001-add-soversion-option.patch
Patch2: 0002-crypto-Fix-aead_test-build-on-aarch64.patch
Patch3: 0003-enable-s390x-builds.patch
Patch4: 0004-fix-alignment-for-ppc64le.patch
Patch5: 0005-fix-alignment-for-arm.patch
BuildRequires: cmake >= 3.0
BuildRequires: gcc-c++
BuildRequires: go
BuildRequires: libunwind-devel
BuildRequires: ninja
ExclusiveArch: %{ix86} x86_64 aarch64 s390x ppc64le
ExclusiveArch: %{ix86} x86_64 aarch64 s390x ppc64le %arm
%description
BoringSSL is an implementation of the Secure Sockets Layer (SSL) and
@@ -63,6 +64,7 @@ derived from OpenSSL.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
%define _lto_cflags %{nil}
+24
View File
@@ -0,0 +1,24 @@
diff -purN boringssl-20190916.orig/crypto/cipher_extra/aead_test.cc boringssl-20190916/crypto/cipher_extra/aead_test.cc
--- boringssl-20190916.orig/crypto/cipher_extra/aead_test.cc 2020-03-10 20:57:53.383996634 +0100
+++ boringssl-20190916/crypto/cipher_extra/aead_test.cc 2020-03-10 20:59:03.108731229 +0100
@@ -31,7 +31,7 @@
#if defined(OPENSSL_AARCH64) || defined(OPENSSL_PPC64LE)
#define ALIGN_BYTES 16
-#elif defined(OPENSSL_S390X)
+#elif defined(OPENSSL_S390X) || defined(OPENSSL_ARM)
#define ALIGN_BYTES 8
#else
#define ALIGN_BYTES 64
diff -purN boringssl-20190916.orig/crypto/poly1305/poly1305_test.cc boringssl-20190916/crypto/poly1305/poly1305_test.cc
--- boringssl-20190916.orig/crypto/poly1305/poly1305_test.cc 2020-03-10 20:57:53.363996424 +0100
+++ boringssl-20190916/crypto/poly1305/poly1305_test.cc 2020-03-10 21:08:32.606731399 +0100
@@ -25,7 +25,7 @@
#include "../test/file_test.h"
#include "../test/test_util.h"
-#if defined(OPENSSL_S390X)
+#if defined(OPENSSL_S390X) || defined(OPENSSL_ARM)
#define ALIGN_BYTES 8
#else
#define ALIGN_BYTES 16