source: patches/lilo-22.8-cross_compile_x86_64-2.patch@ 124823a

Last change on this file since 124823a was 67300de, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Create a clfs-1.1 branch in preperation for a RC.
  • Property mode set to 100644
File size: 2.5 KB

  • checkit 

    Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
Date: 2006-03-11
Initial Package Version: 22.7.1
Upstream Status: Not submitted, purely for cross-compiling for x86_64(-64)
Origin: Self
Description: Allows lilo-static to be built with a cross-compiler (plus
 cross as86, ld86).

diff -Nru lilo-22.8-ori/checkit lilo-22.8/checkit
    old new  
    5858
    5959echo
    6060echo AS86 version $dev or later is required
    61 as86 -v 1>foo1 2>foo2
     61x86_64-unknown-linux-gnu-as86 -v 1>foo1 2>foo2
    6262A=`cat foo1 foo2 | grep version | cut -d " " -f 3`
    6363rm -f foo1 foo2
    6464if [ -z $A ]; then
    65         echo as86 is not present
     65        echo x86_64-unknown-linux-gnu-as86 is not present
    6666        ret=1
    6767else
    6868        vers_min $A $dev
    69         echo as86 version $A
     69        echo x86_64-unknown-linux-gnu-as86 version $A
    7070        if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
    7171fi
    7272
    7373echo
    7474echo LD86 version $dev or later is required
    75 ld86 -v 1>foo1 2>foo2
     75x86_64-unknown-linux-gnu-ld86 -v 1>foo1 2>foo2
    7676L=`cat foo1 foo2 | grep version | cut -d " " -f 3`
    7777rm -f foo1 foo2
    7878if [ -z $L ]; then
    79         echo ld86 is not present
     79        echo x86_64-unknown-linux-gnu-ld86 is not present
    8080        ret=1
    8181else
    8282        vers_min $L $dev
    83         echo ld86 version $L
     83        echo x86_64-unknown-linux-gnu-ld86 version $L
    8484        if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
    8585fi
    8686

  • Makefile 

    diff -Nru lilo-22.8-ori/Makefile lilo-22.8/Makefile
    old new  
    101101  cat $$ROOT/etc/lilo.defines; else echo $(CONFIG); fi ) | \
    102102  sed 's/-D/-DLCF_/g'`
    103103LILO=-DLILO=0xbb920890
    104 KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
    105 HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
    106 DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
     104KVER=
     105HDM=
     106DEVMAPPER=
    107107
    108108TMP=_TmP_
    109109
    110110
    111111SHELL=/bin/sh
    112 CC=gcc
     112#CC=gcc
    113113CPP=$(CC) -E
    114 AS86=as86 -0 -a
    115 LD86=ld86 -0
     114AS86=x86_64-unknown-linux-gnu-as86 -0 -a
     115LD86=x86_64-unknown-linux-gnu-ld86 -0
    116116NASM=nasm
    117117G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
    118118
    … …  
    471471                mv tmp_make Makefile
    472472
    473473version:        common.c lilo.h common.h
    474                 $(CC) $(CFLAGS) -DSHS_MAIN -o version common.c
     474                gcc $(CFLAGS) -DSHS_MAIN -o version common.c
    475475
    476476mkloader:       temp.c
    477                 $(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
     477                gcc $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
    478478
    479479tidy:
    480480                rm -f core $(LIS) *.shs *.crc $(TMP)*
Note: See TracBrowser for help on using the repository browser.