changed debian/source/format to native

This commit is contained in:
luoyaoming 2024-04-23 14:12:55 +08:00
parent 533544accd
commit 01f0d3a4ab
6 changed files with 1 additions and 2714 deletions

View File

@ -1,27 +0,0 @@
Description: Support to build on little endian systems: ia64, riscv64, sh4, and x32
Forwarded: https://boringssl-review.googlesource.com/c/boringssl/+/52965
--- a/src/include/openssl/base.h
+++ b/src/include/openssl/base.h
@@ -84,7 +84,7 @@ extern "C" {
#endif
-#if defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64)
+#if (defined(__x86_64) && defined(__LP64__)) || defined(_M_AMD64) || defined(_M_X64)
#define OPENSSL_64_BIT
#define OPENSSL_X86_64
#elif defined(__x86) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
@@ -109,6 +109,13 @@ extern "C" {
#define OPENSSL_RISCV64
#elif defined(__riscv) && __SIZEOF_POINTER__ == 4
#define OPENSSL_32_BIT
+#elif defined(__ia64__)
+#define OPENSSL_64_BIT
+#elif defined(__x86_64__) && defined(__ILP32__) // x32
+#define OPENSSL_32_BIT
+#define OPENSSL_X86_64
+#elif defined(__sh__)
+#define OPENSSL_32_BIT
#elif defined(__pnacl__)
#define OPENSSL_32_BIT
#define OPENSSL_PNACL

View File

@ -1,14 +0,0 @@
Description: Update debian/sources.mk
Forwarded: not-needed
--- a/src/util/generate_build_files.py
+++ b/src/util/generate_build_files.py
@@ -315,6 +315,9 @@ class Eureka(object):
self.PrintVariableSection(makefile, 'crypto_sources', files['crypto'])
self.PrintVariableSection(makefile, 'ssl_sources', files['ssl'])
self.PrintVariableSection(makefile, 'tool_sources', files['tool'])
+ self.PrintVariableSection(makefile, 'test_support_sources', files['test_support'])
+ self.PrintVariableSection(makefile, 'crypto_test_sources', files['crypto_test'])
+ self.PrintVariableSection(makefile, 'ssl_test_sources', files['ssl_test'])
for ((osname, arch), asm_files) in asm_outputs:
if osname != 'linux':

View File

@ -1,21 +0,0 @@
From: Jochen Sprickerhof <jspricke@debian.org>
Date: Tue, 27 Dec 2022 21:55:33 +0100
Subject: Disable failing test
Forwarded: not-needed
---
src/ssl/ssl_test.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/ssl/ssl_test.cc b/src/ssl/ssl_test.cc
index e2db5a4..2dd9fe8 100644
--- a/src/ssl/ssl_test.cc
+++ b/src/ssl/ssl_test.cc
@@ -8012,6 +8012,7 @@ TEST(SSLTest, PermuteExtensions) {
}
TEST(SSLTest, HostMatching) {
+ GTEST_SKIP() << "Test is failing in Debian, see #1026716";
static const char kCertPEM[] = R"(
-----BEGIN CERTIFICATE-----
MIIB9jCCAZ2gAwIBAgIQeudG9R61BOxUvWkeVhU5DTAKBggqhkjOPQQDAjApMRAw

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +0,0 @@
01-Add-new-Arch-ia64-riscv64-sh4-x32.patch
02-sources-mk.patch
03-Disable-failing-test.patch
04-Revert-Remove-support-for-ppc64le.patch

View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)