pyrox.dev / nixpkgs
lol
fork atom

{libllvm,isl,libiberty,libmpc}: fix references to /usr/bin/uname on native FreeBSD (#356763)

authored by misuzu.tngl.sh and committed by

GitHub 4a30ef65 e79b7de8

+25 -2
+6
pkgs/by-name/li/libiberty/package.nix
··· 14 15 postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; 16 17 configureFlags = [ "--enable-install-libiberty" ] 18 ++ lib.optional (!staticBuild) "--enable-shared"; 19
··· 14 15 postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; 16 17 + # needed until config scripts are updated to not use /usr/bin/uname on FreeBSD native 18 + # updateAutotoolsGnuConfigScriptsHook doesn't seem to work here 19 + postPatch = '' 20 + substituteInPlace ../config.guess --replace-fail /usr/bin/uname uname 21 + ''; 22 + 23 configureFlags = [ "--enable-install-libiberty" ] 24 ++ lib.optional (!staticBuild) "--enable-shared"; 25
+5
pkgs/by-name/li/libmpc/package.nix
··· 1 { lib, stdenv, fetchurl 2 , gmp, mpfr 3 }: 4 5 # Note: this package is used for bootstrapping fetchurl, and thus ··· 20 enableParallelBuilding = true; 21 22 buildInputs = [ gmp mpfr ]; 23 24 doCheck = true; # not cross; 25
··· 1 { lib, stdenv, fetchurl 2 , gmp, mpfr 3 + , updateAutotoolsGnuConfigScriptsHook 4 }: 5 6 # Note: this package is used for bootstrapping fetchurl, and thus ··· 21 enableParallelBuilding = true; 22 23 buildInputs = [ gmp mpfr ]; 24 + nativeBuildInputs = [ 25 + # needed until config scripts are updated to not use /usr/bin/uname on FreeBSD native 26 + updateAutotoolsGnuConfigScriptsHook 27 + ]; 28 29 doCheck = true; # not cross; 30
+7 -1
pkgs/development/compilers/llvm/common/llvm/default.nix
··· 24 , which 25 , sysctl 26 , buildLlvmTools 27 , debugVersion ? false 28 , doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) 29 && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) ··· 112 "shadowstack" 113 ]; 114 115 - nativeBuildInputs = [ cmake ] 116 ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) 117 ++ [ python ] 118 ++ optionals enableManpages [
··· 24 , which 25 , sysctl 26 , buildLlvmTools 27 + , updateAutotoolsGnuConfigScriptsHook 28 , debugVersion ? false 29 , doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) 30 && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) ··· 113 "shadowstack" 114 ]; 115 116 + nativeBuildInputs = [ 117 + cmake 118 + # while this is not an autotools build, it still includes a config.guess 119 + # this is needed until scripts are updated to not use /usr/bin/uname on FreeBSD native 120 + updateAutotoolsGnuConfigScriptsHook 121 + ] 122 ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) 123 ++ [ python ] 124 ++ optionals enableManpages [
+7 -1
pkgs/development/libraries/isl/generic.nix
··· 11 , gmp 12 , autoreconfHook 13 , buildPackages 14 }: 15 16 stdenv.mkDerivation { ··· 25 26 strictDeps = true; 27 depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ]; 28 - nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ autoreconfHook ]; 29 buildInputs = [ gmp ]; 30 31 inherit configureFlags;
··· 11 , gmp 12 , autoreconfHook 13 , buildPackages 14 + , updateAutotoolsGnuConfigScriptsHook 15 }: 16 17 stdenv.mkDerivation { ··· 26 27 strictDeps = true; 28 depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ]; 29 + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ 30 + autoreconfHook 31 + ] ++ [ 32 + # needed until config scripts are updated to not use /usr/bin/uname on FreeBSD native 33 + updateAutotoolsGnuConfigScriptsHook 34 + ]; 35 buildInputs = [ gmp ]; 36 37 inherit configureFlags;