[PATCH 0/2] fix nspr and nss cross-compilation.

  • Done
  • quality assurance status badge
Details
One participant
  • Zheng Junjie
Owner
unassigned
Submitted by
Zheng Junjie
Severity
normal
Z
Z
Zheng Junjie wrote on 22 Apr 07:26 +0200
(address . guix-patches@gnu.org)
cover.1713763513.git.zhengjunjie@iscas.ac.cn
fix nspr and nss cross-compilation.

Zheng Junjie (2):
gnu: nspr: Fix cross-compilation.
gnu: nss: Fix cross-compilation.

gnu/packages/nss.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)


base-commit: af4db17122d759705f3fd0ab03ef36c76ec90338
--
2.41.0
Z
Z
Zheng Junjie wrote on 22 Apr 07:29 +0200
[PATCH 2/2] gnu: nss: Fix cross-compilation.
(address . 70509@debbugs.gnu.org)
1f6e2f8302b773df64bfbe07ec215b359d74331e.1713763513.git.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
---
gnu/packages/nss.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index a93406b9eb..00770f11a9 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -157,6 +157,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"))
@@ -179,7 +182,8 @@ (define-public nss
(setenv "CC" #$(cc-for-target))
;; TODO: Set this unconditionally
#$@(if (%current-target-system)
- #~((setenv "CCC" #$(cxx-for-target)))
+ #~((setenv "CCC" #$(cxx-for-target))
+ (setenv "NATIVE_CC" "gcc"))
#~())
;; No VSX on powerpc-linux.
#$@(if (target-ppc32?)
--
2.41.0
Z
Z
Zheng Junjie wrote on 22 Apr 07:29 +0200
[PATCH 1/2] gnu: nspr: Fix cross-compilation.
(address . 70509@debbugs.gnu.org)
ad3c00645783fe5aad583c8eb51c5a22a0dd4ae1.1713763513.git.zhengjunjie@iscas.ac.cn
* gnu/packages/nss.scm (nspr)[arguments]<#:configure-flags>: When
cross-compilation, Add HOST_CC=gcc.

Change-Id: I337f217f153f8cc3a713906643d6fab9115056e9
---
gnu/packages/nss.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

Toggle diff (18 lines)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 14612d7ce9..a93406b9eb 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -71,7 +71,10 @@ (define-public nspr
#~(list "--disable-static"
"--enable-64bit"
(string-append "LDFLAGS=-Wl,-rpath="
- (assoc-ref %outputs "out") "/lib"))
+ (assoc-ref %outputs "out") "/lib")
+ #$@(if (%current-target-system)
+ #~("HOST_CC=gcc")
+ #~()))
;; Use fixed timestamps for reproducibility.
#:make-flags #~'("SH_DATE='1970-01-01 00:00:01'"
;; This is epoch 1 in microseconds.
--
2.41.0
Z
Re: [bug#70509] [PATCH 0/2] fix nspr and nss cross-compilation.
(address . 70509-done@debbugs.gnu.org)
87v847h4ar.fsf@iscas.ac.cn
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (12 lines)
> fix nspr and nss cross-compilation.
>
> Zheng Junjie (2):
> gnu: nspr: Fix cross-compilation.
> gnu: nss: Fix cross-compilation.
>
> gnu/packages/nss.scm | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>
> base-commit: af4db17122d759705f3fd0ab03ef36c76ec90338

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYocPwACgkQO1qpk+Gi
3/A2Fw/9HV94qVDC6onkZZFDDBbacS0lUL9uyaoQyp1T+8ZRmNl7fI1Amf68levL
QL3PqdXm1bEOWjy+AyDbBr9TJwgT7kVvXZtAbWvgu3aGwqJZGdN0XXzHiMz4VfbY
Gxe0O/2dpDWqONpfP+enf9z167vZ2INiUft1N6zfic7Y0CQ7CzDLxQTT6Q0KEjpb
IBI+QaggJxKpj+Oiun67B+8EpMyqyXAxTyBqUkml9h9YnlmSjLMZpwhZ9/1442CT
1s2RKqLMrJMrTO0XEaZ+bSzyw6V5DPDgROZJROmynPvyP6KoK35LoNhOk+w/1rnD
y43IVYYc88z+xHJr5tUt8yReoWg25nWco2N/VSkz+be9Vt+da7RjTqX0MGjrjTm0
++XcWCzDuXml/vLpUg2r+WNFUhAHlh6QfG5C+oE3ofairgnTFsWb+mLbCi0lNHQW
cFZ6Z/TlJen1tkRCPIyLVsI/E8Z9TlV5Qyy1+dxWzH3hwlYF63ASHpPux4OeErR+
hSNo3EpLSROmlBtdDHUQDpOQErLSlLHmVrLonrNrSJM+oR/9Ae5zWUJKHIxsSD8/
wZyZmrkhT+Y5pKuyA9TicoykLcJMTwzSq2z+ysFC412vOTguhclOj/8QKLgSPkMA
V9rMBWU2gL2D8TqJq0z95ZOlKycrs9JiDIfwA3K5R2LGTWe7iB0=
=/OnV
-----END PGP SIGNATURE-----

Closed
?