patch net-tools to make it work nicely with gcc-3.4
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1898
This commit is contained in:
parent
1eb961902f
commit
66ea9ba4e7
|
@ -6,6 +6,7 @@ cd net-tools-*
|
||||||
cp $config config.h
|
cp $config config.h
|
||||||
sed "s^/usr/share/man^/share^" < man/Makefile > tmp
|
sed "s^/usr/share/man^/share^" < man/Makefile > tmp
|
||||||
mv tmp man/Makefile
|
mv tmp man/Makefile
|
||||||
|
patch -p1 < $patch
|
||||||
make
|
make
|
||||||
mkdir $out
|
mkdir $out
|
||||||
make BASEDIR=$out install
|
make BASEDIR=$out install
|
||||||
|
|
|
@ -8,4 +8,5 @@ stdenv.mkDerivation {
|
||||||
md5 = "888774accab40217dde927e21979c165";
|
md5 = "888774accab40217dde927e21979c165";
|
||||||
};
|
};
|
||||||
config = ./config.h;
|
config = ./config.h;
|
||||||
|
patch = ./net-tools-labels.patch;
|
||||||
}
|
}
|
||||||
|
|
38
pkgs/os-specific/linux/net-tools/net-tools-labels.patch
Normal file
38
pkgs/os-specific/linux/net-tools/net-tools-labels.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
diff -ruN net-tools-1.60/hostname.c net-tools-1.60-new/hostname.c
|
||||||
|
--- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200
|
||||||
|
+++ net-tools-1.60-new/hostname.c 2004-12-17 14:48:15.624174382 +0100
|
||||||
|
@@ -98,6 +98,7 @@
|
||||||
|
fprintf(stderr, _("%s: name too long\n"), program_name);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
exit(1);
|
||||||
|
};
|
||||||
|
@@ -117,6 +118,7 @@
|
||||||
|
fprintf(stderr, _("%s: name too long\n"), program_name);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
exit(1);
|
||||||
|
};
|
||||||
|
@@ -174,6 +176,7 @@
|
||||||
|
printf("%s\n", hp->h_name);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -ruN net-tools-1.60/lib/inet_sr.c net-tools-1.60-new/lib/inet_sr.c
|
||||||
|
--- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100
|
||||||
|
+++ net-tools-1.60-new/lib/inet_sr.c 2004-12-17 14:37:15.416349441 +0100
|
||||||
|
@@ -105,6 +105,7 @@
|
||||||
|
case 2:
|
||||||
|
isnet = 0; break;
|
||||||
|
default:
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fill in the other fields. */
|
Loading…
Reference in a new issue