Making more packages build on the Fuloong2f.

I still can't build the kernel because it requires binutils yet to be released.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23132
This commit is contained in:
Lluís Batlle i Rossell 2010-08-11 20:16:09 +00:00
parent 51f6aec764
commit b368b4b199
6 changed files with 18 additions and 11 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, db4, gettext} :
{ stdenv, fetchurl, openssl, db4, gettext, automake} :
stdenv.mkDerivation {
name = "cyrus-sasl-2.1.23";
@ -9,6 +9,7 @@ stdenv.mkDerivation {
};
preConfigure=''
configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2 --enable-login"
cp ${automake}/share/automake*/config.{sub,guess} config
'';
buildInputs = [ openssl db4 gettext ];
patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ];

View file

@ -1,7 +1,8 @@
{stdenv, fetchurl}:
# I could not build it in armv5tel-linux
# I could not build it in armv5tel-linux or the fuloon2f
assert stdenv.system != "armv5tel-linux";
assert stdenv.system != "ict_loongson-2_v0.3_fpu_v0.1-linux";
stdenv.mkDerivation {
name = "libxcrypt-3.0.2";

View file

@ -1,19 +1,22 @@
{ stdenv, fetchurl, bison, flex, autoconf, automake }:
stdenv.mkDerivation rec {
name = "kbd-1.15.1";
name = "kbd-1.15.2";
src = fetchurl {
url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz";
sha256 = "1klrxas8vjikx6jm6m2lcpmn88lhxb6p3whwgdwq9d9flf1qrf4i";
sha256 = "19pb44m5m0mcgjkmgkjx4fn8j2m4xwqx4g7w2y1nlypg3qcjsq5k";
};
buildInputs = [ bison flex autoconf automake ];
# We get a warning in armv5tel-linux, so we disable -Werror in it
patchPhase = if (stdenv.system == "armv5tel-linux") then ''
sed -i s/-Werror// src/Makefile.am
'' else "";
# We get a warning in armv5tel-linux and the fuloong2f,
# so we disable -Werror in it
patchPhase = if (stdenv.system == "armv5tel-linux" ||
stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux")
then ''
sed -i s/-Werror// src/Makefile.am
'' else "";
# Grrr, kbd 1.15.1 doesn't include a configure script.
preConfigure = "autoreconf";

View file

@ -9,7 +9,9 @@ stdenv.mkDerivation {
};
buildInputs = [ flex cracklib ]
++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") libxcrypt;
++ stdenv.lib.optional
(stdenv.system != "armv5tel-linux" && stdenv.system != "ict_loongson-2_v0.3_fpu_v0.1-linux")
libxcrypt;
preConfigure = ''
configureFlags="$configureFlags --includedir=$out/include/security"

View file

@ -4120,7 +4120,7 @@ let
ps = procps; /* !!! Linux only */
};
mysql = mysql5;
mysql = mysql51;
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };

View file

@ -157,7 +157,7 @@ rec {
name = "fuloong2f_n32";
kernelMajor = "2.6";
kernelHeadersBaseConfig = "fuloong2e_defconfig";
kernelBaseConfig = "fuloong2f_defconfig";
kernelBaseConfig = "lemote2f_defconfig";
kernelArch = "mips";
kernelAutoModules = false;
kernelExtraConfig =