已开启
Add sw_64 support #139
zhangshaoning_uniontech创建于 2025年4月21日
Add sw_64 support #139
已开启
从refs/pull/139/head合入到openEuler-24.03-LTS-SP1
共 2 个文件变更+71-1
| @@ -0,0 +1,61 @@ | |||
| 1 | +From 3718a4a04c715ef068f8daaaa2ce7f29e78d0688 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: zhangxianting <zhangxianting@uniontech.com> | ||
| 3 | +Date: Mon, 18 Nov 2024 17:37:01 +0800 | ||
| 4 | +Subject: [PATCH] nss 3.94 sw | ||
| 5 | + | ||
| 6 | +--- | ||
| 7 | + coreconf/Linux.mk | 5 +++++ | ||
| 8 | + coreconf/config.gypi | 7 ++++++- | ||
| 9 | + 2 files changed, 11 insertions(+), 1 deletion(-) | ||
| 10 | + | ||
| 11 | +diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk | ||
| 12 | +index dcb4324..455cf28 100644 | ||
| 13 | +--- a/coreconf/Linux.mk | ||
| 14 | ++++ b/coreconf/Linux.mk | ||
| 15 | + else | ||
| 16 | + ifeq ($(OS_TEST),sh4a) | ||
| 17 | + CPU_ARCH = sh4 | ||
| 18 | + else | ||
| 19 | ++ifeq ($(OS_TEST),sw_64) | ||
| 20 | ++ OS_REL_CFLAGS = -D_ALPHA_ | ||
| 21 | ++ CPU_ARCH = sw_64 | ||
| 22 | ++else | ||
| 23 | + # $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 | ||
| 24 | + CPU_ARCH = $(OS_TEST) | ||
| 25 | + endif | ||
| 26 | + endif | ||
| 27 | + endif | ||
| 28 | + endif | ||
| 29 | + endif | ||
| 30 | ++endif | ||
| 31 | + | ||
| 32 | + | ||
| 33 | + ifneq ($(OS_TARGET),Android) | ||
| 34 | +diff --git a/coreconf/config.gypi b/coreconf/config.gypi | ||
| 35 | +index 13f857c..17dbfa9 100644 | ||
| 36 | +--- a/coreconf/config.gypi | ||
| 37 | ++++ b/coreconf/config.gypi | ||
| 38 | + | ||
| 39 | + }, | ||
| 40 | + }, | ||
| 41 | + }], | ||
| 42 | +- [ 'target_arch=="arm64" or target_arch=="aarch64" or target_arch=="sparc64" or target_arch=="ppc64" or target_arch=="ppc64le" or target_arch=="s390x" or target_arch=="mips64" or target_arch=="e2k" or target_arch=="riscv64" or target_arch=="loongarch64"', { | ||
| 43 | ++ [ 'target_arch=="arm64" or target_arch=="aarch64" or target_arch=="sparc64" or target_arch=="ppc64" or target_arch=="ppc64le" or target_arch=="s390x" or target_arch=="mips64" or target_arch=="e2k" or target_arch=="riscv64" or target_arch=="sw_64" or target_arch=="loongarch64"', { | ||
| 44 | + 'defines': [ | ||
| 45 | + 'NSS_USE_64', | ||
| 46 | + ], | ||
| 47 | + | ||
| 48 | + 'ARCHS': ['arm64'], | ||
| 49 | + }, | ||
| 50 | + }], | ||
| 51 | ++ [ 'target_arch=="sw_64"', { | ||
| 52 | ++ 'xcode_settings': { | ||
| 53 | ++ 'ARCHS': ['sw_64'], | ||
| 54 | ++ }, | ||
| 55 | ++ }], | ||
| 56 | + ], | ||
| 57 | + }], | ||
| 58 | + [ 'OS=="ios"', { | ||
| 59 | +-- | ||
| 60 | +2.31.1 | ||
| 61 | + | ||
| @@ -26,7 +26,7 @@ | |||
| 26 | Summary: Network Security Services | 26 | Summary: Network Security Services |
| 27 | Name: nss | 27 | Name: nss |
| 28 | Version: %{nss_version} | 28 | Version: %{nss_version} |
| 29 | -Release: 7 | 29 | +Release: 8 |
| 30 | License: MPLv2.0 | 30 | License: MPLv2.0 |
| 31 | URL: http://www.mozilla.org/projects/security/pki/nss/ | 31 | URL: http://www.mozilla.org/projects/security/pki/nss/ |
| 32 | Provides: nss-system-init | 32 | Provides: nss-system-init |
| @@ -60,6 +60,7 @@ Patch9003: Feature-nss-support-SM2-signature-algorithm.patch | |||
| 60 | Patch9004: Feature-nss-fix-the-certificate-resolution-in-sm2.patch | 60 | Patch9004: Feature-nss-fix-the-certificate-resolution-in-sm2.patch |
| 61 | Patch9005: Feature-fix-sm2-sm3-code-error.patch | 61 | Patch9005: Feature-fix-sm2-sm3-code-error.patch |
| 62 | Patch9006: Feature-fix-sm3-code-error.patch | 62 | Patch9006: Feature-fix-sm3-code-error.patch |
| 63 | +Patch9007: nss-3.94-sw.patch | ||
| 63 | 64 | ||
| 64 | %description | 65 | %description |
| 65 | Network Security Services (NSS) is a set of libraries designed to | 66 | Network Security Services (NSS) is a set of libraries designed to |
| @@ -150,6 +151,7 @@ pushd nss | |||
| 150 | %patch9004 -p1 | 151 | %patch9004 -p1 |
| 151 | %patch9005 -p1 | 152 | %patch9005 -p1 |
| 152 | %patch9006 -p1 | 153 | %patch9006 -p1 |
| 154 | +%patch9007 -p1 | ||
| 153 | popd | 155 | popd |
| 154 | 156 | ||
| 155 | %build | 157 | %build |
| @@ -186,6 +188,10 @@ export NSPR_LIB_DIR=%{_libdir} | |||
| 186 | export NSS_USE_SYSTEM_SQLITE=1 | 188 | export NSS_USE_SYSTEM_SQLITE=1 |
| 187 | export NSS_ALLOW_SSLKEYLOGFILE=1 | 189 | export NSS_ALLOW_SSLKEYLOGFILE=1 |
| 188 | 190 | ||
| 191 | +%ifarch sw_64 | ||
| 192 | +export NSS_DISABLE_GTESTS=1 | ||
| 193 | +%endif | ||
| 194 | + | ||
| 189 | %if %{with dbm} | 195 | %if %{with dbm} |
| 190 | %else | 196 | %else |
| 191 | export NSS_DISABLE_DBM=1 | 197 | export NSS_DISABLE_DBM=1 |
| @@ -572,6 +578,9 @@ update-crypto-policies &>/dev/null||: | |||
| 572 | %doc %{_mandir}/man* | 578 | %doc %{_mandir}/man* |
| 573 | 579 | ||
| 574 | %changelog | 580 | %changelog |
| 581 | +* Tue Feb 18 2025 zhangshaoning <zhangshaoning@uniontech.com> - 3.94.0-8 | ||
| 582 | +- Add sw_64 support | ||
| 583 | + | ||
| 575 | * Fri Oct 11 2024 fuanan <fuanan3@h-partners.com> - 3.94.0-7 | 584 | * Fri Oct 11 2024 fuanan <fuanan3@h-partners.com> - 3.94.0-7 |
| 576 | - Add the crypto-policies-scripts Requires | 585 | - Add the crypto-policies-scripts Requires |
| 577 | 586 | ||