mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
core/nss: fix
This commit is contained in:
Kevin Mihelich
parent
b982b4de48
commit
ce51162faf
2 changed files with 121 additions and 2 deletions
112
core/nss/0001-Remove-ARM-AES-from-freebl-gyp.patch
Normal file
112
core/nss/0001-Remove-ARM-AES-from-freebl-gyp.patch
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
From 724bf0ea861fba941b0f7be3256e8b26dbcaa154 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Mon, 21 Oct 2019 12:14:13 -0600
|
||||
Subject: [PATCH] Remove ARM AES from freebl gyp
|
||||
|
||||
---
|
||||
lib/freebl/freebl.gyp | 68 -------------------------------------------
|
||||
1 file changed, 68 deletions(-)
|
||||
|
||||
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp
|
||||
index 39506921c..8eb5162eb 100644
|
||||
--- a/lib/freebl/freebl.gyp
|
||||
+++ b/lib/freebl/freebl.gyp
|
||||
@@ -116,51 +116,6 @@
|
||||
}]
|
||||
]
|
||||
},
|
||||
- {
|
||||
- 'target_name': 'gcm-aes-aarch64_c_lib',
|
||||
- 'type': 'static_library',
|
||||
- 'sources': [
|
||||
- 'gcm-aarch64.c'
|
||||
- ],
|
||||
- 'dependencies': [
|
||||
- '<(DEPTH)/exports.gyp:nss_exports'
|
||||
- ],
|
||||
- 'cflags': [
|
||||
- '-march=armv8-a+crypto'
|
||||
- ],
|
||||
- 'cflags_mozilla': [
|
||||
- '-march=armv8-a+crypto'
|
||||
- ]
|
||||
- },
|
||||
- {
|
||||
- 'target_name': 'armv8_c_lib',
|
||||
- 'type': 'static_library',
|
||||
- 'sources': [
|
||||
- 'aes-armv8.c',
|
||||
- ],
|
||||
- 'dependencies': [
|
||||
- '<(DEPTH)/exports.gyp:nss_exports'
|
||||
- ],
|
||||
- 'conditions': [
|
||||
- [ 'target_arch=="arm"', {
|
||||
- 'cflags': [
|
||||
- '-march=armv8-a',
|
||||
- '-mfpu=crypto-neon-fp-armv8'
|
||||
- ],
|
||||
- 'cflags_mozilla': [
|
||||
- '-march=armv8-a',
|
||||
- '-mfpu=crypto-neon-fp-armv8'
|
||||
- ],
|
||||
- }, 'target_arch=="arm64" or target_arch=="aarch64"', {
|
||||
- 'cflags': [
|
||||
- '-march=armv8-a+crypto'
|
||||
- ],
|
||||
- 'cflags_mozilla': [
|
||||
- '-march=armv8-a+crypto'
|
||||
- ],
|
||||
- }]
|
||||
- ]
|
||||
- },
|
||||
{
|
||||
'target_name': 'freebl',
|
||||
'type': 'static_library',
|
||||
@@ -189,15 +144,6 @@
|
||||
'dependencies': [
|
||||
'gcm-aes-x86_c_lib',
|
||||
],
|
||||
- }, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
|
||||
- 'dependencies': [
|
||||
- 'armv8_c_lib'
|
||||
- ],
|
||||
- }],
|
||||
- [ 'target_arch=="arm64" or target_arch=="aarch64"', {
|
||||
- 'dependencies': [
|
||||
- 'gcm-aes-aarch64_c_lib',
|
||||
- ],
|
||||
}],
|
||||
[ 'OS=="linux"', {
|
||||
'defines!': [
|
||||
@@ -235,15 +181,6 @@
|
||||
'dependencies': [
|
||||
'gcm-aes-x86_c_lib',
|
||||
]
|
||||
- }, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', {
|
||||
- 'dependencies': [
|
||||
- 'armv8_c_lib',
|
||||
- ],
|
||||
- }],
|
||||
- [ 'target_arch=="arm64" or target_arch=="aarch64"', {
|
||||
- 'dependencies': [
|
||||
- 'gcm-aes-aarch64_c_lib',
|
||||
- ],
|
||||
}],
|
||||
[ 'OS!="linux"', {
|
||||
'conditions': [
|
||||
@@ -468,11 +405,6 @@
|
||||
'ARMHF',
|
||||
],
|
||||
}],
|
||||
- [ 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
|
||||
- 'defines': [
|
||||
- 'USE_HW_AES',
|
||||
- ],
|
||||
- }],
|
||||
],
|
||||
}],
|
||||
],
|
||||
--
|
||||
2.23.0
|
||||
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - remove -march=armv8-a in AArch64 CFLAGS to not conflict with -march=armv8-a+crypto being added
|
||||
# this is a stupid, dirty hack that shouldn't be necessary
|
||||
# - patch to remove armv8-specific code in freebl so that other architectures can build
|
||||
|
||||
pkgbase=nss
|
||||
pkgname=(nss ca-certificates-mozilla)
|
||||
|
|
@ -16,10 +17,12 @@ _nsprver=4.20
|
|||
depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
|
||||
makedepends=(perl python gyp)
|
||||
source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
|
||||
certdata2pem.py bundle.sh)
|
||||
certdata2pem.py bundle.sh
|
||||
0001-Remove-ARM-AES-from-freebl-gyp.patch)
|
||||
sha256sums=('6cd0c4438b616bdacc0b5f25ff1506b0d07ee97ea6c95d514c5487200a155fa7'
|
||||
'0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
|
||||
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
|
||||
'3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
|
||||
'8372d34fdeeebd23e1daa7ee1f67510f050cba30c884f81e067dba46f94d1dcf')
|
||||
|
||||
prepare() {
|
||||
mkdir certs
|
||||
|
|
@ -27,6 +30,10 @@ prepare() {
|
|||
cd nss-$pkgver
|
||||
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
|
||||
ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
|
||||
|
||||
if [[ $CARCH != "aarch64" ]]; then
|
||||
patch -p1 -d nss -i $srcdir/0001-Remove-ARM-AES-from-freebl-gyp.patch
|
||||
fi
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue