[153aa07] | 1 | Submitted By: Ken Moffat <ken at linuxfromscratch dot org> |
---|
| 2 | Date: 2006-03-11 |
---|
| 3 | Initial Package Version: 22.7.1 |
---|
| 4 | Upstream Status: Not submitted, purely for cross-compiling for x86_64(-64) |
---|
| 5 | Origin: Self |
---|
| 6 | Description: Allows lilo-static to be built with a cross-compiler (plus |
---|
| 7 | cross as86, ld86). |
---|
| 8 | |
---|
| 9 | diff -Nru lilo-22.8-ori/checkit lilo-22.8/checkit |
---|
| 10 | --- lilo-22.8-ori/checkit 2006-08-13 21:24:45.000000000 +0200 |
---|
| 11 | +++ lilo-22.8/checkit 2007-02-27 07:53:07.000000000 +0100 |
---|
| 12 | @@ -58,29 +58,29 @@ |
---|
| 13 | |
---|
| 14 | echo |
---|
| 15 | echo AS86 version $dev or later is required |
---|
| 16 | -as86 -v 1>foo1 2>foo2 |
---|
| 17 | +x86_64-unknown-linux-gnu-as86 -v 1>foo1 2>foo2 |
---|
| 18 | A=`cat foo1 foo2 | grep version | cut -d " " -f 3` |
---|
| 19 | rm -f foo1 foo2 |
---|
| 20 | if [ -z $A ]; then |
---|
| 21 | - echo as86 is not present |
---|
| 22 | + echo x86_64-unknown-linux-gnu-as86 is not present |
---|
| 23 | ret=1 |
---|
| 24 | else |
---|
| 25 | vers_min $A $dev |
---|
| 26 | - echo as86 version $A |
---|
| 27 | + echo x86_64-unknown-linux-gnu-as86 version $A |
---|
| 28 | if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi |
---|
| 29 | fi |
---|
| 30 | |
---|
| 31 | echo |
---|
| 32 | echo LD86 version $dev or later is required |
---|
| 33 | -ld86 -v 1>foo1 2>foo2 |
---|
| 34 | +x86_64-unknown-linux-gnu-ld86 -v 1>foo1 2>foo2 |
---|
| 35 | L=`cat foo1 foo2 | grep version | cut -d " " -f 3` |
---|
| 36 | rm -f foo1 foo2 |
---|
| 37 | if [ -z $L ]; then |
---|
| 38 | - echo ld86 is not present |
---|
| 39 | + echo x86_64-unknown-linux-gnu-ld86 is not present |
---|
| 40 | ret=1 |
---|
| 41 | else |
---|
| 42 | vers_min $L $dev |
---|
| 43 | - echo ld86 version $L |
---|
| 44 | + echo x86_64-unknown-linux-gnu-ld86 version $L |
---|
| 45 | if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi |
---|
| 46 | fi |
---|
| 47 | |
---|
| 48 | diff -Nru lilo-22.8-ori/Makefile lilo-22.8/Makefile |
---|
| 49 | --- lilo-22.8-ori/Makefile 2007-02-19 18:15:10.000000000 +0100 |
---|
| 50 | +++ lilo-22.8/Makefile 2007-02-27 07:57:03.000000000 +0100 |
---|
| 51 | @@ -101,18 +101,18 @@ |
---|
| 52 | cat $$ROOT/etc/lilo.defines; else echo $(CONFIG); fi ) | \ |
---|
| 53 | sed 's/-D/-DLCF_/g'` |
---|
| 54 | LILO=-DLILO=0xbb920890 |
---|
| 55 | -KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi` |
---|
| 56 | -HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi` |
---|
| 57 | -DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi` |
---|
| 58 | +KVER= |
---|
| 59 | +HDM= |
---|
| 60 | +DEVMAPPER= |
---|
| 61 | |
---|
| 62 | TMP=_TmP_ |
---|
| 63 | |
---|
| 64 | |
---|
| 65 | SHELL=/bin/sh |
---|
| 66 | -CC=gcc |
---|
| 67 | +#CC=gcc |
---|
| 68 | CPP=$(CC) -E |
---|
| 69 | -AS86=as86 -0 -a |
---|
| 70 | -LD86=ld86 -0 |
---|
| 71 | +AS86=x86_64-unknown-linux-gnu-as86 -0 -a |
---|
| 72 | +LD86=x86_64-unknown-linux-gnu-ld86 -0 |
---|
| 73 | NASM=nasm |
---|
| 74 | G=`cat foo1 foo2 | grep version | cut -d " " -f 3` |
---|
| 75 | |
---|
| 76 | @@ -471,10 +471,10 @@ |
---|
| 77 | mv tmp_make Makefile |
---|
| 78 | |
---|
| 79 | version: common.c lilo.h common.h |
---|
| 80 | - $(CC) $(CFLAGS) -DSHS_MAIN -o version common.c |
---|
| 81 | + gcc $(CFLAGS) -DSHS_MAIN -o version common.c |
---|
| 82 | |
---|
| 83 | mkloader: temp.c |
---|
| 84 | - $(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c |
---|
| 85 | + gcc $(CFLAGS) -DLILO_BINARY -o mkloader temp.c |
---|
| 86 | |
---|
| 87 | tidy: |
---|
| 88 | rm -f core $(LIS) *.shs *.crc $(TMP)* |
---|