Changeset 1731

Show
Ignore:
Timestamp:
10/09/06 06:41:11 (2 years ago)
Author:
alexander
Message:

Linked cdrtools and zisofs-tools against glibc in /tools

Before this commit, cdrtools and zisofs-tools were built against the LiveCD
libc, but used the host's libc at runtime, which was bad.

Location:
branches/6.2
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • branches/6.2/Makefile

    r1726 r1731  
    221221        lfs-gawk-scpt lfs-gettext-scpt lfs-grep-scpt lfs-gzip-scpt \ 
    222222        lfs-m4-scpt lfs-make-scpt lfs-patch-scpt lfs-perl-scpt lfs-sed-scpt \ 
    223         lfs-tar-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt 
     223        lfs-tar-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt \ 
     224        lfs-cdrtools-scpt lfs-zlib-scpt lfs-zisofs-tools-scpt 
    224225        @cp /etc/resolv.conf $(WD)/etc 
    225226 
    … …  
    255256        ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \ 
    256257        ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol ch-ddccontrol-db \ 
    257         ch-initramfs ch-zisofs-tools ch-cdrtools ch-blfs-bootscripts ch-oui-data \ 
     258        ch-initramfs ch-blfs-bootscripts ch-oui-data \ 
    258259        ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \ 
    259260        ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-scim-hangul \ 
    … …  
    279280        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \ 
    280281        ch-strace ch-iptables ch-eject ch-hdparm ch-linux \ 
    281         ch-initramfs ch-cdrtools ch-zisofs-tools ch-blfs-bootscripts \ 
     282        ch-initramfs ch-blfs-bootscripts \ 
    282283        ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \ 
    283284        ch-bin86 ch-lilo ch-syslinux 

  • branches/6.2/packages/cdrtools/Makefile

    r1488 r1731  
    99SHA-$(FILE)= f94cfe51dd512d4e0b9106b986bde12d4f7967ce 
    1010 
    11 # Strictly speaking, this is not needed for making the LFS Live CD because 
    12 # filenames on the LiveCD don't contain non-ASCII characters, but 
    13 # without this patch you can't make a Windows-readabe CD with non-ASCII 
    14 # filenames in UTF-8 locale. 
    15  
    16 PATCH1= $(DIR)-mkisofs_iconv-10.patch 
    17 URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1) 
    18 SHA-$(PATCH1)= 4a4d6a784e57678a865844021f52fe5fad3623bb 
    19  
    20 # Targets 
    21  
    2211include $(ROOT)/scripts/functions 
    2312 
    24 chroot: 
    25         chroot "$(MP)" $(chenv-blfs) \ 
    26         'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    27  
    28 stage2: Makefile $(FILE) $(PATCH1) 
     13stage1: Makefile $(FILE) 
    2914        $(std_build) 
    3015 
    31 compile-stage2: 
    32         # downconvert messages from ISO-8859-1 to ASCII to make 
    33         # sure that they are readable everywhere 
    34         # 
    35         # RedHat's cdrtools-2.01a27-UTF8.patch changes the same 
    36         # messages, but converts them to UTF-8 instead since 
    37         # encodings other than UTF-8 are not supported by RedHat 
    38         for F in cdrecord/cdrecord.c cdrecord/diskid.c cdrecord/sector.c \ 
    39                  readcd/readcd.c scgcheck/scgcheck.c scgskeleton/skel.c ; do \ 
    40             LC_ALL=de_DE iconv -f ISO-8859-1 -t US-ASCII//TRANSLIT $$F >tmp ; \ 
    41             mv tmp $$F ; done 
    42         patch -Np1 -i ../$(PATCH1) 
    43         make $(PM) INS_BASE=/tools DEFINSUSR=root DEFINSGRP=root 
     16compile-stage1: 
     17        make INS_BASE=/tools DEFINSUSR=root DEFINSGRP=root 
    4418        make INS_BASE=/tools DEFINSUSR=root DEFINSGRP=root install 
    4519 
    … …  
    4721        -rm -rf $(DIR) 
    4822 
    49 .PHONY: clean chroot compile-stage2 
     23.PHONY: clean compile-stage1 

  • branches/6.2/packages/zisofs-tools/Makefile

    r1450 r1731  
    1313include $(ROOT)/scripts/functions 
    1414 
    15 chroot: 
    16         chroot "$(MP)" $(chenv-blfs) \ 
    17         'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    18  
    19 stage2: Makefile $(FILE) 
     15stage1: Makefile $(FILE) 
    2016        $(std_build) 
    2117 
    22 compile-stage2: 
    23         ./configure --prefix=/tools 
     18compile-stage1: 
     19        ./configure --prefix=/tools CFLAGS="-I/tools/zlib/include" LDFLAGS="-L/tools/zlib/lib" 
    2420        make $(PM) 
    2521        make install 
    … …  
    2824        -rm -rf $(DIR) 
    2925 
    30 .PHONY: clean chroot compile-stage2 
     26.PHONY: clean chroot compile-stage1 

  • branches/6.2/packages/zlib/Makefile

    r1528 r1731  
    1717        'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' 
    1818 
     19stage1: Makefile $(FILE) 
     20        $(std_build) 
     21 
    1922stage2: Makefile $(FILE) 
    2023        $(std_build) 
    2124        cp $(SRC)/$(FILE) $(LFSSRC) 
     25 
     26compile-stage1: 
     27        ./configure --prefix=/tools/zlib 
     28        make 
     29        make install 
    2230 
    2331compile-stage2: