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

* Urgh. Get ATerm 2.4.2-fixes to build with the -fno-strict-aliasing

Browse source 
flag.  Note that ATerm 2.5 causes Nix to segfault, and ATerm 2.8
  doesn't even build on x86_64-linux (see
  http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=1042).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19020
This commit is contained in:
Eelco Dolstra 2009-12-17 21:22:58 +00:00
parent 193f70d887
commit 06d295f51b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/aterm/2.4.2-fixes.nix
View file

@ -12,6 +12,12 @@ stdenv.mkDerivation {
# Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841 # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
./max-long.patch ./max-long.patch
]; ];
# There are apparently still some aliasing bugs left in
# aterm-2.4.2-fixes-r2 (in AT_setAnnotations to be precise), but
# under my reading of the C standard it should be fine. Anyway, just
# disable strict aliasing.
NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
doCheck = true; doCheck = true;

4
pkgs/top-level/all-packages.nix
View file

@ -8499,7 +8499,7 @@ let
nix = makeOverridable (import ../tools/package-management/nix) { nix = makeOverridable (import ../tools/package-management/nix) {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm25; aterm = aterm242fixes;
db4 = db45; db4 = db45;
supportOldDBs = getPkgConfig "nix" "OldDBSupport" true; supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
@ -8509,7 +8509,7 @@ let
# The bleeding edge. # The bleeding edge.
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl;
aterm = aterm25; aterm = aterm242fixes;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };