Sfoglia il codice sorgente

Merge #79738: glibc, openssl: unbreak cross eval

(with minor caveats)
wip-nanopi-m4v2
Vladimír Čunát 6 anni fa
parent
commit
e94a7366e7
Non sono state trovate chiavi note per questa firma nel database ID Chiave GPG: E747DF1F9575A3AA
2 ha cambiato i file con 7 aggiunte e 1 eliminazioni
  1. +4
    -0
      pkgs/development/libraries/glibc/common.nix
  2. +3
    -1
      pkgs/development/libraries/openssl/default.nix

+ 4
- 0
pkgs/development/libraries/glibc/common.nix Vedi File

@@ -111,6 +111,10 @@ stdenv.mkDerivation ({
# nscd needs libgcc, and we don't want it dynamically linked
# because we don't want it to depend on bootstrap-tools libs.
echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
''
# FIXME: find a solution for infinite recursion in cross builds.
# For now it's hopefully acceptable that IDN from libc doesn't reliably work.
+ lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''

# Ensure that libidn2 is found.
patch -p 1 <<EOF


+ 3
- 1
pkgs/development/libraries/openssl/default.nix Vedi File

@@ -36,7 +36,9 @@ let

outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false)
&& stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
&& stdenv.cc.isGNU;

nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodev;


Caricamento…
Annulla
Salva