ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

gcc42: fix build via a patch from arch

Browse Source
This commit is contained in:
Vladimír Čunát 2013-04-10 14:46:50 +02:00
parent 3e208067ea
commit 4c62d0d144
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/gcc/4.2/default.nix
View File

@ -30,11 +30,11 @@ stdenv.mkDerivation {
url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg"; sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg";
}); });
patches = patches =
[./pass-cxxcpp.patch] [./pass-cxxcpp.patch ./siginfo_t.patch]
++ optional noSysDirs [./no-sys-dirs.patch]; ++ optional noSysDirs [./no-sys-dirs.patch];
inherit noSysDirs profiledCompiler staticCompiler; inherit noSysDirs profiledCompiler staticCompiler;
buildInputs = [gmp mpfr texinfo]; buildInputs = [gmp mpfr texinfo];

15
pkgs/development/compilers/gcc/4.2/siginfo_t.patch Normal file
View File

@ -0,0 +1,15 @@
https://bbs.archlinux.org/viewtopic.php?id=144949
--- a/gcc/config/i386/linux-unwind.h 2011-01-03 20:52:22.000000000 +0000
+++ b/gcc/config/i386/linux-unwind.h 2012-07-06 12:23:51.562859470 +0100
@@ -133,9 +133,9 @@
{
struct rt_sigframe {
int sig;
- struct siginfo *pinfo;
+ siginfo_t *pinfo;
void *puc;
- struct siginfo info;
+ siginfo_t info;
struct ucontext uc;
} *rt_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.