unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Christina O'Donnell <cdo@mutix.org>
To: 40316@debbugs.gnu.org
Cc: zhengjunjie@iscas.ac.cn, vagrant@reproducible-builds.org,
	steve@futurile.net
Subject: bug#40316: [PATCH v3 1/5] gnu: nss: Fix cross-compilation.
Date: Thu,  2 May 2024 13:33:36 +0100	[thread overview]
Message-ID: <5ac99f62f8c43d2df3f64cd77ccbe0540dd82269.1714653076.git.cdo@mutix.org> (raw)
In-Reply-To: <cover.1714653076.git.cdo@mutix.org>

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"))
-- 
2.41.0





       reply	other threads:[~2024-05-02 12:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1714653076.git.cdo@mutix.org>
2024-05-02 12:33 ` Christina O'Donnell [this message]
2024-05-02 12:33 ` bug#40316: [PATCH v3 2/5] gnu: nspr: Fix cross-compilation Christina O'Donnell
2024-05-02 12:33 ` bug#40316: [PATCH v3 3/5] gnu: nss: Update to 3.99 Christina O'Donnell
2024-05-02 12:33 ` bug#40316: [PATCH v3 4/5] gnu: nss-certs: " Christina O'Donnell
2024-05-02 12:33 ` bug#40316: [PATCH v3 5/5] gnu: nss: Make reproducible Christina O'Donnell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5ac99f62f8c43d2df3f64cd77ccbe0540dd82269.1714653076.git.cdo@mutix.org \
    --to=cdo@mutix.org \
    --cc=40316@debbugs.gnu.org \
    --cc=steve@futurile.net \
    --cc=vagrant@reproducible-builds.org \
    --cc=zhengjunjie@iscas.ac.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).