JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Syslinux updated to 3.31.

Browse Source 
* Some uber-ugly hacks to get it to build on x86_64 with a non-32-bit
  enabled GCC.

svn path=/nixpkgs/trunk/; revision=7756
This commit is contained in:
Eelco Dolstra 2007-01-22 19:14:50 +00:00
parent 6223d7e219
commit c219e77af7
4 changed files with 17 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/syslinux/builder.sh
View File

@ -1,10 +0,0 @@
buildinputs=""
source $stdenv/setup
#tar xvfj $src
#cd syslinux-3.09
#make
#mkdir $out
#make BASEDIR=$out install
genericBuild

23
pkgs/os-specific/linux/syslinux/default.nix
View File

@ -1,12 +1,23 @@
{stdenv, fetchurl, nasm, perl}:
stdenv.mkDerivation {
name = "syslinux-3.20";
builder = ./builder.sh;
name = "syslinux-3.31";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.20.tar.bz2;
md5 = "0701e0de1de6d31bdd889384b041e5b7";
url = http://www.nl.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.31.tar.bz2;
sha256 = "1w0hw28w97mj27h4w64wn9bi24zcff1i8ifcxnbh4iing1pcmi2p";
};
buildInputs = [nasm perl];
patches = [./syslinux-3.20-installpath.patch];
buildInputs = [nasm perl];
preBuild = "
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include)
# Really dirty hack to get syslinux to build without needing a GCC
# with 32-bit libraries and headers.
if test \"$system\" = x86_64-linux; then
substituteInPlace memdisk/Makefile \\
--replace 'all: memdisk e820test' 'all: memdisk'
mkdir gnu
touch gnu/stubs-32.h
fi
";
}

28
pkgs/os-specific/linux/syslinux/syslinux-3.20-installpath.patch
View File

@ -1,28 +0,0 @@
diff -rc syslinux-3.20/Makefile syslinux-3.20.new/Makefile
*** syslinux-3.20/Makefile 2006-08-26 19:32:12.000000000 +0200
--- syslinux-3.20.new/Makefile 2006-08-28 23:48:18.000000000 +0200
***************
*** 25,35 ****
NASM = nasm -O99
NINCLUDE =
! BINDIR = /usr/bin
! SBINDIR = /sbin
! LIBDIR = /usr/lib
AUXDIR = $(LIBDIR)/syslinux
! INCDIR = /usr/include
PERL = perl
--- 25,35 ----
NASM = nasm -O99
NINCLUDE =
! BINDIR = $(out)/bin
! SBINDIR = $(out)/sbin
! LIBDIR = $(out)/lib
AUXDIR = $(LIBDIR)/syslinux
! INCDIR = $(out)/include
PERL = perl

19
pkgs/os-specific/linux/syslinux/syslinux-installpath.patch
View File

@ -1,19 +0,0 @@
diff -ruN syslinux-3.09/Makefile syslinux-3.09.new/Makefile
--- syslinux-3.09/Makefile 2005-04-02 23:48:47.000000000 +0200
+++ syslinux-3.09.new/Makefile 2005-07-30 20:49:41.000000000 +0200
@@ -26,11 +26,11 @@
NASM = nasm -O99
NINCLUDE =
-BINDIR = /usr/bin
-SBINDIR = /sbin
-LIBDIR = /usr/lib
+BINDIR = $(out)/bin
+SBINDIR = $(out)/sbin
+LIBDIR = $(out)/lib
AUXDIR = $(LIBDIR)/syslinux
-INCDIR = /usr/include
+INCDIR = $(out)/include
PERL = perl