[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#40316: [PATCH v2 1/6] gnu: nss: Fix cross-compilation.
From: |
Christina O'Donnell |
Subject: |
bug#40316: [PATCH v2 1/6] gnu: nss: Fix cross-compilation. |
Date: |
Thu, 2 May 2024 12:00:45 +0100 |
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
* gnu/packages/nss.scm (nss)[arguments]<#:make-flags>: When
cross-compilation, Add CROSS_COMPILE=1.
<#:phases>: When cross-compilation, Set env NATIVE_CC to gcc.
Change-Id: I5c9559a4b8cecf2cfc6c47d136d69c01a335faaf
Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
---
gnu/packages/nss.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 7e9ed49ead..459e53bc1c 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -154,6 +154,9 @@ (define-public nss
(#$(target-linux?) "linux")
(else ""))))
#~())
+ #$@(if (%current-target-system)
+ #~("CROSS_COMPILE=1")
+ #~())
(string-append "NSPR_INCLUDE_DIR="
(search-input-directory %build-inputs
"include/nspr"))
@@ -175,6 +178,10 @@ (define-public nss
(lambda _
(setenv "CC" #$(cc-for-target))
(setenv "CCC" #$(cxx-for-target))
+ ;; TODO: Set this unconditionally
+ #$@(if (%current-target-system)
+ #~((setenv "NATIVE_CC" "gcc"))
+ #~())
;; No VSX on powerpc-linux.
#$@(if (target-ppc32?)
#~((setenv "NSS_DISABLE_CRYPTO_VSX" "1"))
base-commit: 9a47ef6182b6a36354699efbdbedca17f24cd9b8
--
2.41.0
- bug#40316: [PATCH v2 0/6] Attempt to make nss reproducible, Christina O'Donnell, 2024/05/02
- bug#40316: [PATCH v2 1/6] gnu: nss: Fix cross-compilation.,
Christina O'Donnell <=
- bug#40316: [PATCH v2 2/6] gnu: nspr: Fix cross-compilation., Christina O'Donnell, 2024/05/02
- bug#40316: [PATCH v2 4/6] gnu: nss-certs: Update to 3.99., Christina O'Donnell, 2024/05/02
- bug#40316: [PATCH v2 3/6] gnu: nss: Update to 3.99., Christina O'Donnell, 2024/05/02
- bug#40316: [PATCH v2 5/6] gnu: nss: Attempt to disable FIPS., Christina O'Donnell, 2024/05/02
- bug#40316: [PATCH v2 6/6] gnu: nss: Disable FIPS in lowhashtest., Christina O'Donnell, 2024/05/02
- bug#40316: [PATCH v2 0/6] Attempt to make nss reproducible, Christina O'Donnell, 2024/05/02