Changeset 1983
- Timestamp:
- 07/25/07 16:46:21 (1 year ago)
- Files:
-
- branches/x86_64/Makefile (modified) (4 diffs)
- branches/x86_64/isolinux/isolinux.cfg (modified) (1 diff)
- branches/x86_64/isolinux/options.msg (modified) (1 diff)
- branches/x86_64/packages/LFS-BOOK/Makefile (modified) (1 diff)
- branches/x86_64/packages/bin86/Makefile (modified) (2 diffs)
- branches/x86_64/packages/binutils/Makefile (modified) (3 diffs)
- branches/x86_64/packages/gcc/Makefile (modified) (3 diffs)
- branches/x86_64/packages/glibc/Makefile (modified) (1 diff)
- branches/x86_64/packages/initramfs/Makefile (modified) (2 diffs)
- branches/x86_64/packages/initramfs/init.in (modified) (1 diff)
- branches/x86_64/packages/linux/Makefile (modified) (1 diff)
- branches/x86_64/packages/traceroute/Makefile (modified) (2 diffs)
- branches/x86_64/packages/unzip/Makefile (modified) (1 diff)
- branches/x86_64/packages/zlib/Makefile (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/x86_64/Makefile
r1976 r1983 33 33 ROOTFS_MEGS := 1536 34 34 35 export VERSION ?= x86 -6.3-pre236 export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing -mtune=i68635 export VERSION ?= x86_64-6.3-min-pre1 36 export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing 37 37 export CXXFLAGS ?= $(CFLAGS) 38 export LFS_TARGET ?= i486-pc-linux-gnu38 export LFS_TARGET ?= x86_64-unknown-linux-gnu 39 39 40 40 … … 147 147 -install -d $(MP)/opt/{bin,doc,include,info} 148 148 -install -d $(MP)/opt/{lib,man/man{1,2,3,4,5,6,7,8}} 149 -if [ ! -L $(MP)/lib64 ] ; then ln -s lib $(MP)/lib64 ; fi 150 -if [ ! -L $(MP)/usr/lib64 ] ; then ln -s lib $(MP)/usr/lib64 ; fi 149 151 -mknod -m 600 $(MP)/dev/console c 5 1 150 152 -mknod -m 666 $(MP)/dev/null c 1 3 … … 263 265 ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \ 264 266 ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \ 265 ch-fuse ch-dosfstools ch-ntfsprogs ch-bin86 ch-grub ch-lilo ch-syslinux \ 266 ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \ 267 ch-initramfs 267 ch-fuse ch-dosfstools ch-ntfsprogs ch-bin86 ch-lilo ch-syslinux \ 268 ch-scsi-firmware ch-net-firmware ch-initramfs 268 269 make update-caches 269 270 … … 349 350 350 351 update-caches: 351 cd /usr/share/fonts ; mkfontscale ; mkfontdir ; fc-cache -f352 352 mandb -c 2>/dev/null 353 353 echo 'dummy / ext2 defaults 0 0' >/etc/mtab branches/x86_64/isolinux/isolinux.cfg
r1769 r1983 8 8 kernel linux 9 9 append initrd=initramfs_data_cpio.gz 10 11 label linux6412 kernel linux6413 append initrd=initramfs_data_cpio.gzbranches/x86_64/isolinux/options.msg
r1769 r1983 9 9 792 = 1024x768x24 791 = 1024x768x16 10 10 789 = 800x600x24 788 = 800x600x16 11 12 A 64-bit kernel for use with CLFS is available as "linux64"13 11 14 12 To set your timezone, add TZ=your_timezone anywhere branches/x86_64/packages/LFS-BOOK/Makefile
r1976 r1983 11 11 #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 12 12 13 REV= 82 2513 REV= 8250 14 14 REVPARM= -r $(REV) 15 15 16 URL= svn://svn.linuxfromscratch.org/LFS/ trunk/BOOK16 URL= svn://svn.linuxfromscratch.org/LFS/branches/x86_64/BOOK 17 17 18 18 # Targets branches/x86_64/packages/bin86/Makefile
r1884 r1983 9 9 SHA-$(FILE)= 656f06b4b26d08412132e338baa25e42d713eeec 10 10 11 PATCH= $(DIR)-x86_64-1.patch 12 URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/$(PATCH) 13 SHA-$(PATCH)= 2c967c062fbee4e40ca1bf55feec2033e132e0a9 14 11 15 # Targets 12 16 … … 17 21 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 18 22 19 stage2: Makefile $(FILE) 23 stage2: Makefile $(FILE) $(PATCH) 20 24 $(std_build) 21 25 22 26 compile-stage2: 27 patch -Np1 -i ../$(PATCH) 23 28 make PREFIX=/usr MANDIR=/usr/share/man/man1 24 29 make PREFIX=/usr MANDIR=/usr/share/man/man1 install branches/x86_64/packages/binutils/Makefile
r1835 r1983 25 25 unset CFLAGS ; make -C ld LIB_PATH=$(WD)/lib 26 26 cp -v ld/ld-new $(WD)/bin 27 ln -sv lib $(WD)/lib64 27 28 28 29 adjust-toolchain: … … 31 32 mv -v $(WD)/bin/{ld-new,ld} 32 33 ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld 33 gcc -dumpspecs | sed 's@ ^/lib/ld-linux.so.2@/tools&@g' \34 gcc -dumpspecs | sed 's@/lib64/ld-linux-x86-64.so.2@/tools&@g' \ 34 35 > `dirname $$(gcc -print-libgcc-file-name)`/specs 35 36 GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \ … … 62 63 ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld 63 64 gcc -dumpspecs | sed \ 64 -e 's@/tools/lib /ld-linux.so.2@/lib/ld-linux.so.2@g' \65 -e 's@/tools/lib64/ld-linux-x86-64.so.2@/lib64/ld-linux-x86-64.so.2@g' \ 65 66 -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \ 66 67 -e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \ branches/x86_64/packages/gcc/Makefile
r1976 r1983 26 26 unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) \ 27 27 --with-local-prefix=$(WD) --disable-nls --enable-shared \ 28 --enable-languages=c --enable-static 28 --enable-languages=c --enable-static --disable-multilib 29 29 unset CFLAGS ; make bootstrap 30 30 unset CFLAGS ; make install … … 41 41 > gcc/Makefile.in 42 42 cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) 43 cd ../$(DIR) ; cp -v gcc/config/i386/t-linux64{,.tmp} && \ 44 sed '/MULTILIB_OSDIRNAMES/d' gcc/config/i386/t-linux64.tmp \ 45 > gcc/config/i386/t-linux64 43 46 # --enable-static overrides the unsuitable default in config.site 44 47 ../$(DIR)/configure --prefix=$(WD) \ 45 48 --with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \ 46 49 --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \ 47 --disable-libstdcxx-pch --enable-static 50 --disable-libstdcxx-pch --enable-static --disable-multilib 48 51 make 49 52 make install … … 66 69 ../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \ 67 70 --enable-shared --enable-threads=posix --enable-__cxa_atexit \ 68 --enable-clocale=gnu --enable-languages=c,c++ --enable-static 71 --enable-clocale=gnu --enable-languages=c,c++ --enable-static \ 72 --disable-multilib 69 73 make 70 74 -make -k check branches/x86_64/packages/glibc/Makefile
r1976 r1983 51 51 cd ../$(DIR) ; unpack ../$(FILE2) ; mv glibc-libidn-$(VRS) libidn 52 52 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/ld-linux-x86-64.so.2 -o|' \ 54 54 ../$(DIR)/scripts/test-installation.pl 55 55 # LiveCD specific locale additions branches/x86_64/packages/initramfs/Makefile
r1976 r1983 21 21 compile-stage2: 22 22 mkdir -p $(WDIR)/{bin,dev,etc/udev/rules.d,lib/firmware,sbin,sys,proc} 23 ln -s lib $(WDIR)/lib64 23 24 cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf 24 25 cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d … … 30 31 mknod -m 664 $(WDIR)/dev/null c 1 3 31 32 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)/lib33 cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,ld-linux-x86-64.so.2} $(WDIR)/lib 33 34 cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib 34 35 cp /lib/{libpthread.so.0,librt.so.1,libuuid.so.1} $(WDIR)/lib branches/x86_64/packages/initramfs/init.in
r1976 r1983 318 318 # Clean up and free some memory 319 319 rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init /fakecd.iso.head 320 ./lib/ld-linux .so.2 --library-path ./lib ./bin/mount -n --move . /321 exec ../lib/ld-linux .so.2 --library-path ./lib ./usr/sbin/chroot . "$init" "$@"320 ./lib/ld-linux-x86-64.so.2 --library-path ./lib ./bin/mount -n --move . / 321 exec ../lib/ld-linux-x86-64.so.2 --library-path ./lib ./usr/sbin/chroot . "$init" "$@" branches/x86_64/packages/linux/Makefile
r1976 r1983 26 26 mkdir -p /boot/isolinux 27 27 make mrproper 28 cp ../config.x86.config28 cp $(ROOT)/packages/linux64/config.x86_64 .config 29 29 make 30 30 make modules_install 31 cp -v arch/ i386/boot/bzImage /boot/isolinux/linux31 cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux 32 32 cd .. ; ./debian-style-headers.sh $(DIR) 33 33 branches/x86_64/packages/traceroute/Makefile
r1816 r1983 9 9 SHA-$(FILE)= c68ec1b09539a8e9655c138031c3090bda92d5f1 10 10 11 PATCH= $(DIR)-update_config-1.patch 12 URL-$(PATCH)= http://svn.cross-lfs.org/svn/repos/patches/$(NM)/$(PATCH) 13 SHA-$(PATCH)= f52c3772bcd63f9f06137128d8e3b64c7c533743 14 11 15 # Targets 12 16 … … 17 21 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 18 22 19 stage2: Makefile $(FILE) 23 stage2: Makefile $(FILE) $(PATCH) 20 24 $(std_build) 21 25 22 26 compile-stage2: 27 patch -Np1 -i ../$(PATCH) 23 28 sed -i -e 's/-o bin/-o root/' Makefile.in 24 29 ./configure --prefix=/usr branches/x86_64/packages/unzip/Makefile
r1871 r1983 21 21 22 22 compile-stage2: 23 make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux 23 make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm 24 24 make prefix=/usr MANDIR=/usr/share/man/man1 install 25 25 branches/x86_64/packages/zlib/Makefile
r1816 r1983 29 29 30 30 compile-stage2: 31 ./configure --prefix=/usr --shared --libdir=/lib32 make33 make install31 unset CFLAGS ; ./configure --prefix=/usr --shared --libdir=/lib 32 unset CFLAGS ; make 33 unset CFLAGS ; make install 34 34 rm /lib/libz.so 35 35 ln -sf ../../lib/libz.so.$(VRS) /usr/lib/libz.so 36 make clean37 ./configure --prefix=/usr38 make39 make install36 unset CFLAGS ; make clean 37 unset CFLAGS ; ./configure --prefix=/usr 38 unset CFLAGS ; make 39 unset CFLAGS ; make install 40 40 chmod 644 /usr/lib/libz.a 41 41
