Changeset 2000

Show
Ignore:
Timestamp:
08/01/07 11:22:23 (1 year ago)
Author:
jhuntwork
Message:

* Merged the essentials of r1994 to trunk.
* Merged r1995, r1996 and r1998 to trunk.
* Some additional provisions so that x86 will build linux and linux64 kernels
with appropriate drivers, but x86_64 only builds a 64-bit kernel called
linux with appropriate drivers.
* Simplified the options.msg file, hopefully easier to read at a glance
* Adjusted libjpeg, Mesa and vbetool to build on x86_64.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    r1999 r2000  
    1313# 
    1414 
    15 # Machine architecure, LiveCD version, and specific arch variables. 
    16 #============================================================================== 
    17  
    1815# Place your personal customizations in Makefile.personal 
    1916# instead of editing this Makefile. 
    …… 
    2219-include Makefile.personal 
    2320 
    24 #============================================================================== 
    25  
    26 # Here are the various variables you might want/need to change. You can change 
    27 # them here or in Makefile.personal. Variables mentioned in the README will not 
    28 # be commented on here. 
     21# Here are the various variables you might want/need to change. 
     22# Variables mentioned in the README will not be commented on here. 
    2923 
    3024export MPBASE ?= /mnt/lfs 
    …… 
    3327ROOTFS_MEGS := 1536 
    3428 
    35 export VERSION ?= x86-6.3-pre2 
    36 export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing -mtune=i686 
     29# Machine architecure, LiveCD version, and specific arch variables. 
     30#============================================================================== 
     31 
     32export CD_ARCH := $(shell uname -m | sed 's|i[3456]|x|') 
     33export VERSION ?= $(CD_ARCH)-6.3-pre2 
     34export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing 
     35 
     36ifeq ($(CD_ARCH),x86) 
     37export LFS_TARGET ?= i486-pc-linux-gnu 
     38export CFLAGS := $(CFLAGS) -mtune=i686 
     39export LINKER := ld-linux.so.2 
     40endif 
     41 
     42ifeq ($(CD_ARH),x86_64) 
     43export 64bit = true 
     44export LFS_TARGET ?= $(MACHTYPE) 
     45export LINKER := ld-linux-x86-64.so.2 
     46endif 
     47 
    3748export CXXFLAGS ?= $(CFLAGS) 
    38 export LFS_TARGET ?= i486-pc-linux-gnu 
    39  
    4049 
    4150# Default timezone 
    …… 
    102111        @if [ `whoami` != "root" ] ; then \ 
    103112         echo "You must be logged in as root." && exit 1 ; fi 
     113 
     114test-env: 
     115        env 
    104116 
    105117# This image should be kept as clean as possible, i.e.: 
    …… 
    162174        -ln -s /proc/kcore $(MP)/dev/core 
    163175        touch $(MKTREE) 
     176ifdef 64bit 
     177        -if [ ! -L $(MP)/lib64 ] ; then ln -s lib $(MP)/lib64 ; fi 
     178        -if [ ! -L $(MP)/usr/lib64 ] ; then ln -s lib $(MP)/usr/lib64 ; fi 
     179endif 
    164180 
    165181# This target builds just a base LFS system, minus the kernel and bootscripts 
    …… 
    264280        ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \ 
    265281        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-brltty  \ 
    266         ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \ 
     282        ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm \ 
    267283        ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol ch-ddccontrol-db \ 
    268284        ch-blfs-bootscripts ch-oui-data \ 
    …… 
    270286        ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-libhangul ch-scim-hangul \ 
    271287        ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \ 
    272         ch-hibernate-script ch-slang ch-mc \ 
    273         ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \ 
    274         ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux \ 
    275         ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \ 
    276         ch-initramfs ch-gcc33 
     288        ch-hibernate-script ch-slang ch-mc ch-fuse ch-dosfstools ch-ntfsprogs \ 
     289        ch-libaal ch-reiser4progs ch-vbetool ch-bin86 ch-lilo ch-syslinux \ 
     290        ch-scsi-firmware ch-net-firmware 
     291ifeq ($(CD_ARCH),x86) 
     292        make ch-grub 
     293        make ch-linux 
     294        make ch-binutils64 
     295        make ch-gcc64 
     296endif 
     297        make ch-linux64 
     298        make ch-initramfs 
     299        make ch-gcc33 
    277300        make update-caches 
    278301 
    …… 
    361384 
    362385update-caches: 
    363         cd /usr/share/fonts ; mkfontscale ; mkfontdir ; fc-cache -f 
    364386        mandb -c 2>/dev/null 
    365387        echo 'dummy / ext2 defaults 0 0' >/etc/mtab 
    …… 
    379401        @>$(MP)/var/log/wtmp 
    380402        @>$(MP)/var/log/lastlog 
    381         @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux 
     403        @install -m644 isolinux/{isolinux.cfg,splash.lss} $(MP)/boot/isolinux 
     404ifeq ($(CD_ARCH),x86_64) 
     405        @sed -i -e '/linux64/d' -e 's/ 32-bit//' $(MP)/boot/isolinux/options.msg 
     406        @sed -i '/linux64/,$$d' $(MP)/boot/isolinux/isolinux.cfg 
     407endif 
    382408        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg 
    383409        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue* 

  • trunk/etc/bashrc

    r1874 r2000  
    1313                BOLD=$WHITE ;; 
    1414        *) 
    15                 BOLD="\[\033[0;38m\]" ;; 
     15                BOLD="\[\033[0;1m\]" ;; 
    1616esac 
    1717 

  • trunk/isolinux/boot.msg

    r1574 r2000  
    22splash.lss 
    3307This is the Official LFS LiveCD, Version: 
    4 07Press [Enter] to boot or press F1 for more options. 
     407Press [Enter] to boot, F1 for basic options 
    55 

  • trunk/isolinux/options.msg

    r1769 r2000  
    1 70 07To use a framebuffer console, type "linux vga=xxx" 
    2 where xxx denotes a screen resolution and color depth. 
    3 This has nothing to do with X server resolution, and bug reports 
    4 about X window system will be ignored if you pass this parameter. 
     170 07To specify options at boot time, type [kernel] [options] 
     2Available kernels: 
     3linux - The default 32-bit kernel 
     4linux64 - A 64-bit kernel for use with CLFS 
    55 
    6 Examples: 
     6Basic options: 
     7vga=[res] 
     8  Examples: 
     9  vga=795 (1280x1024x24)  vga=794 (1280x1024x16) 
     10  vga=792 (1024x768x24)   vga=791 (1024x768x16) 
     11  vga=789 (800x600x24)    vga=788 (800x600x16) 
    712 
    8 795 = 1280x1024x24   794 = 1280x1024x16 
    9 792 = 1024x768x24    791 = 1024x768x16 
    10 789 = 800x600x24     788 = 800x600x16 
     13  NOTE: This is for the framebuffer console and has nothing 
     14  to do with X server resolution. 
    1115 
    12 A 64-bit kernel for use with CLFS is available as "linux64" 
     16TZ=[timezone] 
     17  Examples: 
     18  TZ=EDT-4    TZ=America/New_York 
    1319 
    14 To set your timezone, add TZ=your_timezone anywhere 
    15 after "linux" or "linux.ata". For example, TZ=EDT+4 means that the 
    16 timezone is named "EDT" and is 4 hours behind (west) of UTC. 
    17 Specifications like TZ=America/New_York also work. 
    18 Also, add UTC=1 if the hardware clock in your computer 
    19 is set to UTC instead of local time. 
     20  The first example means that the timezone is named "EDT" 
     21  and is 4 hours behind (west) of UTC. 
    2022 
    21 Set your locale by adding LANG=your_locale anywhere after "linux". 
     23UTC=[0,1] 
     24  Use UTC=1 if the hardware clock is set to UTC or 
     25  use UTC=0 if the hardware clock is set to local time. 
     26 
     27LANG=[locale] 
    2228 
    2329If you don't specify your timezone or locale at the boot prompt, 
    2430a configuration dialog will appear later during boot. 
    2531 
    26 More information is available in /root/README on this CD. 
    27  

  • trunk/packages/LFS-BOOK/Makefile

    r1969 r2000  
    1111#SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 
    1212 
    13 REV= 8225 
     13REV= 8250 
    1414REVPARM= -r $(REV) 
    1515 
     16ifeq ($(CD_ARCH),x86) 
    1617URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK 
     18endif 
     19ifeq ($(CD_ARCH),x86_64) 
     20URL= svn://svn.linuxfromscratch.org/LFS/branches/x86_64/BOOK 
     21endif 
    1722 
    1823SEAMONKEY_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js 
    …… 
    4752clean: 
    4853        -rm -rf tmp 
     54        -rm -rf $(ROOT)/root/tmp 
    4955 
    5056.PHONY: clean chroot compile-stage2 

  • trunk/packages/Mesa/Makefile

    r1817 r2000  
    2626compile-stage2: 
    2727        unpack ../$(FILE1) --strip-components=1 
     28ifeq ($(CD_ARCH),x86) 
    2829        make linux-dri-x86 OPT_FLAGS="$(CFLAGS)" MKDEP="gccmakedep" INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/lib/dri 
     30endif 
     31ifeq ($(CD_ARCH),x86_64) 
     32        make linux-dri-x86-64 OPT_FLAGS="$(CFLAGS)" MKDEP="gccmakedep" INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/lib/dri 
     33endif 
    2934        make INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/lib/dri install 
    3035        sed -i 's@-l$$(GLUT_LIB)@@g' configs/default 

  • trunk/packages/bin86/Makefile

    r1884 r2000  
    99SHA-$(FILE)= 656f06b4b26d08412132e338baa25e42d713eeec 
    1010 
     11PATCH= $(DIR)-x86_64-1.patch 
     12URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/$(PATCH) 
     13SHA-$(PATCH)= 2c967c062fbee4e40ca1bf55feec2033e132e0a9 
     14 
    1115# Targets 
    1216 
    …… 
    1721        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    1822 
    19 stage2: Makefile $(FILE) 
     23stage2: Makefile $(FILE) $(PATCH) 
    2024        $(std_build) 
    2125 
    2226compile-stage2: 
     27ifeq ($(CD_ARCH),x86_64) 
     28        patch -Np1 -i ../$(PATCH) 
     29endif 
    2330        make PREFIX=/usr MANDIR=/usr/share/man/man1 
    2431        make PREFIX=/usr MANDIR=/usr/share/man/man1 install 

  • trunk/packages/binutils/Makefile

    r1835 r2000  
    2525        unset CFLAGS ; make -C ld LIB_PATH=$(WD)/lib 
    2626        cp -v ld/ld-new $(WD)/bin 
     27ifdef 64bit 
     28        ln -s lib $(WD)/lib64 
     29endif 
    2730 
    2831adjust-toolchain: 
    …… 
    3134        mv -v $(WD)/bin/{ld-new,ld} 
    3235        ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld 
    33         gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&@g' \ 
     36        gcc -dumpspecs | sed 's@/lib[64]*/$(LINKER)@/tools&@g' \ 
    3437          > `dirname $$(gcc -print-libgcc-file-name)`/specs 
    3538        GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \ 
    …… 
    6164        mv -v $(WD)/bin/{ld-new,ld} 
    6265        ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld 
    63         gcc -dumpspecs | sed \ 
    64             -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \ 
     66        gcc -dumpspecs | sed -e 's@/tools@@g' \ 
    6567            -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \ 
    6668            -e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \ 

  • trunk/packages/gcc/Makefile

    r1966 r2000  
    2626        unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) \ 
    2727         --with-local-prefix=$(WD) --disable-nls --enable-shared \ 
    28          --enable-languages=c --enable-static 
     28         --enable-languages=c --enable-static --disable-multilib 
    2929        unset CFLAGS ; make bootstrap 
    3030        unset CFLAGS ; make install 
    …… 
    4141         > gcc/Makefile.in 
    4242        cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) 
     43ifdef 64bit 
     44        cd ../$(DIR) ; cp -v gcc/config/i386/t-linux64{,.tmp} && \ 
     45         sed '/MULTILIB_OSDIRNAMES/d' gcc/config/i386/t-linux64.tmp \ 
     46         > gcc/config/i386/t-linux64 
     47endif 
    4348# --enable-static overrides the unsuitable default in config.site 
    4449        ../$(DIR)/configure --prefix=$(WD) \ 
    4550         --with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \ 
    4651         --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \ 
    47          --disable-libstdcxx-pch --enable-static 
     52         --disable-libstdcxx-pch --enable-static --disable-multilib 
    4853        make 
    4954        make install 
    …… 
    6671        ../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \ 
    6772         --enable-shared --enable-threads=posix --enable-__cxa_atexit \ 
    68          --enable-clocale=gnu --enable-languages=c,c++ --enable-static 
     73         --enable-clocale=gnu --enable-languages=c,c++ --enable-static \ 
     74         --disable-multilib 
    6975        make 
    7076        -make -k check 

  • trunk/packages/gcc33/Makefile

    r1670 r2000  
    3535         --enable-shared --enable-threads=posix --enable-__cxa_atexit \ 
    3636         --enable-clocale=gnu --enable-languages=c,c++ --enable-static \ 
    37          --build=$(LFS_TARGET) --host=$(LFS_TARGET) --target=$(LFS_TARGET) 
     37         --build=$(LFS_TARGET) --host=$(LFS_TARGET) --target=$(LFS_TARGET) \ 
     38         --disable-multilib 
    3839        make bootstrap 
    3940        cp -av $(LFS_TARGET)/libstdc++-v3/src/.libs/libstdc++.so.5* /usr/lib 

  • trunk/packages/glibc/Makefile

    r1969 r2000  
    5151        cd ../$(DIR) ; unpack ../$(FILE2) ; mv glibc-libidn-$(VRS) libidn 
    5252        sed -i \ 
    53         's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \ 
     53        's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/$(LINKER) -o|' \ 
    5454                ../$(DIR)/scripts/test-installation.pl 
    5555# LiveCD specific locale additions 

  • trunk/packages/initramfs/Makefile

    r1999 r2000  
    2121compile-stage2: 
    2222        mkdir -p $(WDIR)/{bin,dev,etc/udev/rules.d,lib/firmware,sbin,sys,proc} 
     23ifdef 64bit 
     24        ln -s lib $(WDIR)/lib64 
     25endif 
    2326        cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf 
    2427        cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d 
    …… 
    3033        mknod -m 664 $(WDIR)/dev/null c 1 3 
    3134        cp /bin/{sh,dd,cat,cp,killall,mkdir,mount,umount,sed,sleep,ln,rm,uname} $(WDIR)/bin 
    32         cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,ld-linux.so.2} $(WDIR)/lib 
     35        cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,$(LINKER)} $(WDIR)/lib 
    3336        cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib 
    3437        cp /lib/{libpthread.so.0,librt.so.1,libuuid.so.1} $(WDIR)/lib 

  • trunk/packages/initramfs/init.in

    r1969 r2000  
    1818nodhcp=0 
    1919cdtype= 
     20 
     21case `uname -m` in  
     22        i[3456]86) LINKER="ld-linux.so.2" ;; 
     23 
     24        x86_64) LINKER="ld-linux-x86-64.so.2" ;; 
     25esac 
    2026 
    2127find_cd() { 
    …… 
    339345# Clean up and free some memory 
    340346rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init /fakecd.iso.head 
    341 ./lib/ld-linux.so.2 --library-path ./lib ./bin/mount -n --move . / 
    342 exec ../lib/ld-linux.so.2 --library-path ./lib ./usr/sbin/chroot . "$init" "$@" 
     347./lib/${LINKER} --library-path ./lib ./bin/mount -n --move . / 
     348exec ../lib/${LINKER} --library-path ./lib ./usr/sbin/chroot . "$init" "$@" 

  • trunk/packages/libjpeg/Makefile

    r1871 r2000  
    99SHA-$(FILE)= 0b4ef1e7dcee85e631a958b1ea493b6b0f2f2250 
    1010 
     11PATCH= $(DIR)-config_update-1.patch 
     12URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/patches/jpeg/$(PATCH) 
     13SHA-$(PATCH)= 5d99bf64e42500b7c357684ed153ad5ecbaa3c2c 
     14 
    1115# Targets 
    1216 
    …… 
    1721        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    1822 
    19 stage2: Makefile $(FILE) 
     23stage2: Makefile $(FILE) $(PATCH) 
    2024        $(std_build) 
    2125 
    22 compile-stage2:  
     26compile-stage2: 
     27        patch -Np1 -i ../$(PATCH) 
    2328        ./configure --prefix=/usr --enable-static --enable-shared 
    2429        make 

  • trunk/packages/linux/Makefile

    r1999 r2000  
    4848        zcat ../$(PATCH1) | patch -Np1 
    4949        patch -Np1 -i ../$(PATCH3) 
    50         mkdir -p /boot/isolinux 
     50        install -d /boot/isolinux 
    5151        make mrproper 
    5252        cp ../config.x86 .config 

  • trunk/packages/linux64/Makefile

    r1999 r2000  
    4848        zcat ../$(PATCH1) | patch -Np1 
    4949        patch -Np1 -i ../$(PATCH3) 
     50        install -d /boot/isolinux 
    5051        make mrproper 
    5152        cp ../config.x86_64 .config 
    5253        # Hack for fglrx 
    5354        touch include/linux/ioctl32.h 
     55ifeq ($(CD_ARCH),x86) 
    5456        PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    5557        PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    …… 
    6365        rm /lib/modules/*-64bit/{source,build} 
    6466        cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64 
     67endif 
     68ifeq ($(CD_ARCH),x86_64) 
     69        make 
     70        make modules_install 
     71        sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/uname.in >../fakes-for-fglrx/uname 
     72        sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/cat.in >../fakes-for-fglrx/cat 
     73        chmod 755 ../fakes-for-fglrx/{uname,cat} 
     74        PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg Slackware/All 
     75        for a in $(DIR2) $(DIR3) $(DIR4) ; do \ 
     76            sh ../$$a.run -x ; ../build-nvidia-driver.native $$a $(VRS)-64bit ; done 
     77        mv *.tgz /drivers 
     78        rm /lib/modules/*-64bit/{source,build} 
     79        cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux 
     80endif 
    6581 
    6682clean: 

  • trunk/packages/linux64/fakes-for-fglrx/gcc

    r1935 r2000  
    55        ;; 
    66*) 
    7         /tools/bin/x86_64-unknown-linux-gnu-gcc "$@" 
     7        case `/bin/uname -m` in 
     8                x86_64) 
     9                        /usr/bin/gcc "$@" 
     10                        ;; 
     11                *) 
     12                        /tools/bin/x86_64-unknown-linux-gnu-gcc "$@" 
     13                        ;; 
     14        esac 
    815        ;; 
    916esac 

  • trunk/packages/linux64/fakes-for-fglrx/ld

    r1935 r2000  
    11#!/bin/sh 
    2 /tools/bin/x86_64-unknown-linux-gnu-ld "$@" 
     2case `/bin/uname -m` in 
     3        x86_64) 
     4                /usr/bin/ld "$@" 
     5                ;; 
     6        *) 
     7                /tools/bin/x86_64-unknown-linux-gnu-ld "$@" 
     8                ;; 
     9esac 

  • trunk/packages/linux64/fakes-for-fglrx/objdump

    r1935 r2000  
    11#!/bin/sh 
    2 /tools/bin/x86_64-unknown-linux-gnu-objdump "$@" 
     2case `/bin/uname -m` in 
     3        x86_64) 
     4                /usr/bin/objdump "$@" 
     5                ;; 
     6        *) 
     7                /tools/bin/x86_64-unknown-linux-gnu-objdump "$@" 
     8                ;; 
     9esac 

  • trunk/packages/traceroute/Makefile

    r1816 r2000  
    99SHA-$(FILE)= c68ec1b09539a8e9655c138031c3090bda92d5f1 
    1010 
     11PATCH= $(DIR)-update_config-1.patch 
     12URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/patches/$(NM)/$(PATCH) 
     13SHA-$(PATCH)= f52c3772bcd63f9f06137128d8e3b64c7c533743 
     14 
    1115# Targets 
    1216 
    …… 
    1721        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    1822 
    19 stage2: Makefile $(FILE) 
     23stage2: Makefile $(FILE) $(PATCH) 
    2024        $(std_build) 
    2125 
    2226compile-stage2: 
     27        patch -Np1 -i ../$(PATCH) 
    2328        sed -i -e 's/-o bin/-o root/' Makefile.in 
    2429        ./configure --prefix=/usr 

  • trunk/packages/unzip/Makefile

    r1871 r2000  
    2121 
    2222compile-stage2: 
     23ifeq ($(CD_ARCH),x86) 
    2324        make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux 
     25else 
     26        make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm 
     27endif 
    2428        make prefix=/usr MANDIR=/usr/share/man/man1 install 
    2529 

  • trunk/packages/vbetool/Makefile

    r1813 r2000  
    2222 
    2323compile-stage2: 
     24ifeq ($(CD_ARCH),x86) 
    2425        ./configure --prefix=/usr 
     26endif 
     27ifeq ($(CD_ARCH),x86_64) 
     28        ./configure --prefix=/usr --with-x86emu 
     29endif 
    2530        make 
    2631        make install 

  • trunk/packages/zlib/Makefile

    r1816 r2000  
    2929 
    3030compile-stage2: 
    31         ./configure --prefix=/usr --shared --libdir=/lib 
    32         make 
     31        unset CFLAGS ; ./configure --prefix=/usr --shared --libdir=/lib 
     32        unset CFLAGS ; make 
    3333        make install 
    3434        rm /lib/libz.so 
    3535        ln -sf ../../lib/libz.so.$(VRS) /usr/lib/libz.so 
    3636        make clean 
    37         ./configure --prefix=/usr 
    38         make 
     37        unset CFLAGS ; ./configure --prefix=/usr 
     38        unset CFLAGS ; make 
    3939        make install 
    4040        chmod 644 /usr/lib/libz.a 

  • trunk/scripts/shutdown-helper

    r1968 r2000  
    11#!/bin/sh 
    22 
     3case `uname -m` in 
     4        i[3456]86) LINKER="ld-linux.so.2" ;; 
     5 
     6        x86_64) LINKER="ld-linux-x86-64.so.2" ;; 
     7esac 
     8 
    39FILES="/lib/libc.so.6 
    4 /lib/ld-linux.so.2 
     10/lib/${LINKER} 
    511/lib/libreadline.so.5 
    612/lib/libhistory.so.5 
    …… 
    4652ln -s /proc/mounts /dev/shm/etc/mtab 
    4753echo "$FILES" | cpio -pLd --quiet /dev/shm 
     54case `uname -m` in 
     55        x86_64) 
     56                ln -s lib /dev/shm/lib64 
     57                ln -s lib /dev/shm/usr/lib64 
     58                ;; 
     59esac 
    4860if [ -b /dev/lfs-cd ] ; then cp -RH /dev/lfs-cd /dev/shm/dev/lfs-cd ; fi 
    4961