diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-01-22 22:10:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-01-22 22:10:14 +0000 |
| commit | 44a1817bef6568799b78d9c9283d22d73d5fdc38 (patch) | |
| tree | 3dbc7bad3453098940fdbb95d8abfcad617c43d7 /pkgs/os-specific | |
| parent | 1c4dd404609ce3201368c89042f8fbf20aacbd7b (diff) | |
| download | nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.tar nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.tar.gz nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.tar.bz2 nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.tar.lz nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.tar.xz nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.tar.zst nixpkgs-44a1817bef6568799b78d9c9283d22d73d5fdc38.zip | |
* Some hackery to get e2fsprogs to build on x86_64 with dietlibc.
svn path=/nixpkgs/trunk/; revision=7758
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/dietlibc/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/e2fsprogs/default.nix | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix index 4a575c73f21..633bd40749d 100644 --- a/pkgs/os-specific/linux/dietlibc/default.nix +++ b/pkgs/os-specific/linux/dietlibc/default.nix @@ -28,5 +28,10 @@ stdenv.mkDerivation { # from 0.31 CVS. ./dns64.patch + # Get lseek64 working on x86_64. From + # http://svn.annvix.org/cgi-bin/viewvc.cgi/packages/releases/2.0-CURRENT/dietlibc/SOURCES + ./x86_64-lseek64.patch + #./x86_64-stat64.patch + ]; } diff --git a/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch b/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch new file mode 100644 index 00000000000..47187a310d2 --- /dev/null +++ b/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch @@ -0,0 +1,6 @@ +--- dietlibc-0.27/x86_64/lseek64.S.x86_64-lseek64 2005-03-29 08:46:09.074515293 -0500 ++++ dietlibc-0.27/x86_64/lseek64.S 2005-03-29 08:46:09.074515293 -0500 +@@ -0,0 +1,3 @@ ++#include "syscalls.h" ++ ++syscall_weak(lseek,lseek64,__libc_lseek64) diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix index da9ed73e2b9..732abc52ef0 100644 --- a/pkgs/os-specific/linux/e2fsprogs/default.nix +++ b/pkgs/os-specific/linux/e2fsprogs/default.nix @@ -15,5 +15,5 @@ stdenv.mkDerivation { preInstall = "installFlagsArray=('LN=ln -s')"; postInstall = "make install-libs"; NIX_CFLAGS_COMPILE = - if stdenv ? isDietLibC then "-UHAVE_SYS_PRCTL_H" else ""; + if stdenv ? isDietLibC then "-UHAVE_SYS_PRCTL_H -DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else ""; } |