alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gnu-config: 2019-04-15 -> 2020-05-04

Browse source 
Update gnu-config (config.sub, config.guess) to suport the Genode
platform and apply the updateAutotoolsGnuConfigScriptsHook to Genode
cross-compilation.
This commit is contained in:
Emery Hemingway 2020-05-07 14:02:14 +05:30
parent 67af42e35f
commit f5ef00a12f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/gnu-config/default.nix
View file

@ -1,21 +1,20 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let let
rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406"; rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79";
# Don't use fetchgit as this is needed during Aarch64 bootstrapping # Don't use fetchgit as this is needed during Aarch64 bootstrapping
configGuess = fetchurl { configGuess = fetchurl {
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
sha256 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw"; sha256 = "sha256-TSLpYIDGSp1flqCBi2Sgg9IWDV5bcO+Hn2Menv3R6KU=";
}; };
configSub = fetchurl { configSub = fetchurl {
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; sha256 = "sha256-DkCGDN/DE3phQ1GO/Ua5ZPPtp0Ya93PnW3yfSK8EV9s=";
}; };
in in stdenv.mkDerivation {
stdenv.mkDerivation {
pname = "gnu-config"; pname = "gnu-config";
version = "2019-04-15"; version = "2020-05-04";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out

3
pkgs/stdenv/cross/default.nix
View file

@ -72,7 +72,8 @@ in lib.init bootStages ++ [
(hostPlatform.isLinux && !buildPlatform.isLinux) (hostPlatform.isLinux && !buildPlatform.isLinux)
[ buildPackages.patchelf ] [ buildPackages.patchelf ]
++ lib.optional ++ lib.optional
(let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS; in f hostPlatform && !(f buildPlatform)) (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode;
in f hostPlatform && !(f buildPlatform) )
buildPackages.updateAutotoolsGnuConfigScriptsHook buildPackages.updateAutotoolsGnuConfigScriptsHook
# without proper `file` command, libtool sometimes fails # without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs # to recognize 64-bit DLLs