Author: alexander Date: 2006-03-24 07:10:23 -0700 (Fri, 24 Mar 2006) New Revision: 1451
Added: branches/udev_update/packages/glibc/vars/ Modified: branches/udev_update/Makefile branches/udev_update/packages/bash/Makefile branches/udev_update/packages/binutils/Makefile branches/udev_update/packages/binutils/vars/vars.sparc64 branches/udev_update/packages/coreutils/Makefile branches/udev_update/packages/db/Makefile branches/udev_update/packages/gcc/Makefile branches/udev_update/packages/gcc/vars/vars.sparc64 branches/udev_update/packages/glibc/Makefile branches/udev_update/packages/texinfo/Makefile branches/udev_update/packages/util-linux/Makefile branches/udev_update/vars/vars.sparc64 Log: Merged r1430:1444 from trunk Modified: branches/udev_update/Makefile =================================================================== --- branches/udev_update/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -38,8 +38,8 @@ export timezone ?= GMT export pagesize ?= letter export ROOT ?= /lfs-livecd -export PM ?= -j3 -export HTTP ?= http://ftp.lfs-matrix.net/pub/lfs/conglomeration +#export PM ?= -j3 +export HTTP ?= http://ftp.linuxfromscratch.org/pub/lfs/conglomeration export HTTPBLFS ?= http://ftp.lfs-matrix.net/pub/blfs/conglomeration # Directory variables @@ -89,8 +89,8 @@ export chbash-pre-bash := SHELL=$(WD)/bin/bash export chbash-post-bash := SHELL=/bin/bash -export WHICH= $(WD)/bin/which -export WGET?= wget +export WHICH ?= $(WD)/bin/which +export WGET ?= wget export BRW= "[0;1m" export RED= "[0;31m" @@ -290,10 +290,10 @@ lfs-wget-scpt lfs-strip @cp /etc/resolv.conf $(WD)/etc else -tools: lfs-binutils-scpt lfs-gcc-scpt lfs-zlib-scpt lfs-gawk-scpt lfs-coreutils-scpt \ +tools: lfs-binutils-scpt lfs-gcc-scpt lfs-gawk-scpt lfs-coreutils-scpt \ lfs-bzip2-scpt lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt lfs-make-scpt \ lfs-grep-scpt lfs-sed-scpt lfs-gettext-scpt lfs-ncurses-scpt lfs-patch-scpt \ - lfs-tar-scpt lfs-bash-scpt lfs-util-linux-scpt lfs-wget-scpt + lfs-tar-scpt lfs-bash-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt @cp /etc/resolv.conf $(WD)/etc endif Modified: branches/udev_update/packages/bash/Makefile =================================================================== --- branches/udev_update/packages/bash/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/bash/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -28,7 +28,7 @@ sed "[EMAIL PROTECTED] \$$(Program)@$(LFS_TARGET)-&@g" Makefile.in.orig > Makefile.in echo "ac_cv_func_setvbuf_reversed=no" >> config.cache CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \ - ./configure --prefix=$(WD) --with-curses \ + ./configure --prefix=$(WD) \ --without-bash-malloc --host=$(LFS_TARGET) \ --cache-file=config.cache endif Modified: branches/udev_update/packages/binutils/Makefile =================================================================== --- branches/udev_update/packages/binutils/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/binutils/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -54,7 +54,7 @@ # fIXME: copy this file for cross-case also pass1: $(FILE) - $(sep_dir_build_noclean) + $(sep_dir_build) cp $(SRC)/$(FILE) $(LFSSRC) compile-pass1: @@ -63,25 +63,26 @@ make install make -C ld clean make -C ld LIB_PATH=$(WD)/lib + cp -v ld/ld-new $(WD)/bin adjust-toolchain: - echo 'main(){}' > dummy.c && cc dummy.c && \ - readelf -l a.out > .specstest - if ! grep -q $(WD) .specstest ; then cd $(NM)-build && \ - make -C ld install && \ - SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \ - gcc -dumpspecs > $$SPECFILE && \ - sed 's@/lib/$(LINKER)@$(WD)&@g' $$SPECFILE > tempspecfile && \ - mv -f tempspecfile $$SPECFILE && unset SPECFILE && \ - GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \ - find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rf '{}' \; && \ - rm -f `grep -l "DO NOT EDIT THIS FILE" $${GCC_INCLUDEDIR}/*` && \ - unset GCC_INCLUDEDIR && \ - cd .. && make clean ; fi + mv -v $(WD)/bin/{ld,ld-old} + mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old} + mv -v $(WD)/bin/{ld-new,ld} + ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld + SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \ + gcc -dumpspecs > $$SPECFILE && \ + sed '[EMAIL PROTECTED]/lib/[EMAIL PROTECTED](WD)&@g' $$SPECFILE > tempspecfile && \ + mv -vf tempspecfile $$SPECFILE && \ + unset SPECFILE + GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \ + find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \ + rm -vf `grep -l "DO NOT EDIT THIS FILE" $${GCC_INCLUDEDIR}/*` && \ + unset GCC_INCLUDEDIR touch $@ pass2: $(FILE) - $(sep_dir_build_noclean) + $(sep_dir_build) compile-pass2: ../$(DIR)/configure --prefix=$(WD) --disable-nls \ @@ -90,21 +91,21 @@ make install make -C ld clean make -C ld LIB_PATH=/usr/lib:/lib + cp -v ld/ld-new $(WD)/bin chroot-re-adjust-toolchain: chroot "$(MP)" $(chenv-pre-bash) \ 'cd $(ROOT) && make ch-re-adjust-toolchain $(chbash-pre-bash)' re-adjust-toolchain: - echo 'main(){}' > dummy.c && cc dummy.c && \ - readelf -l a.out > .specstest - if grep -q $(WD) .specstest ; then cd $(NM)-build && \ - make -C ld INSTALL=$(WD)/bin/install install && \ - SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \ - gcc -dumpspecs > $$SPECFILE && \ - sed -i '[EMAIL PROTECTED](WD)/lib/$(LINKER)@/lib/$(LINKER)@g' $$SPECFILE && \ - unset SPECFILE ; fi - make clean + mv -v $(WD)/bin/{ld,ld-old} + mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old} + mv -v $(WD)/bin/{ld-new,ld} + ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld + gcc -dumpspecs | \ + perl -p -e '[EMAIL PROTECTED](WD)/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED];' \ + -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' > \ + `dirname $$(gcc --print-libgcc-file-name)`/specs touch $@ chroot: Modified: branches/udev_update/packages/binutils/vars/vars.sparc64 =================================================================== --- branches/udev_update/packages/binutils/vars/vars.sparc64 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/binutils/vars/vars.sparc64 2006-03-24 14:10:23 UTC (rev 1451) @@ -7,3 +7,4 @@ SHA-$(PATCH31)= 801e459c49aa2046143f68c51e39c8d6d648e011 PATCHES=$(PATCH30) $(PATCH31) $(PATCH40) $(PATCH41) +ENABLE-64-BIT-BFD=--enable-64-bit-bfd Modified: branches/udev_update/packages/coreutils/Makefile =================================================================== --- branches/udev_update/packages/coreutils/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/coreutils/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -35,7 +35,7 @@ echo "utils_cv_sys_open_max=1024" >> config.cache CC="$${CC} $(64FLAGS)" \ ./configure --prefix=$(WD) --cache-file=config.cache \ - --build=$(LFS_HOST) --target=$(LFS_TARGET) + --build=$(LFS_HOST) --host=$(LFS_TARGET) endif make $(PM) make install Modified: branches/udev_update/packages/db/Makefile =================================================================== --- branches/udev_update/packages/db/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/db/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -4,9 +4,9 @@ VRS= 4.4.16 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz -URL-$(FILE)= http://downloads.sleepycat.com/$(FILE) -SHA-$(FILE)= 08ce785ad051ed6e9712201423ddb9045d0cd62c +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) +SHA-$(FILE)= dd03d6f2d3802c8e5f92e650d3be514f47810b39 # Targets Modified: branches/udev_update/packages/gcc/Makefile =================================================================== --- branches/udev_update/packages/gcc/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/gcc/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -42,7 +42,7 @@ ../$(DIR)/configure --prefix=$(CROSS_WD) --host=$(LFS_HOST) \ --target=$(LFS_TARGET) --with-local-prefix=$(WD) --disable-nls \ --disable-shared --disable-threads --enable-languages=c - make $(PM) all-gcc + make $(CFLAGS_FOR_TARGET) $(PM) all-gcc make install-gcc cross: $(FILE) $(PATCH1) $(PATCH40) $(PATCH41) @@ -92,9 +92,8 @@ --with-local-prefix=$(WD) --enable-long-long --enable-c99 \ --enable-shared --enable-threads=posix --enable-__cxa_atexit \ --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch - make AS_FOR_TARGET="$(CROSS_WD)/bin/$(LFS_TARGET)-as" \ - LD_FOR_TARGET="$(CROSS_WD)/bin/$(LFS_TARGET)-ld" \ - $(EXTRA_FLAGS_FOR_TOOLS) $(PM) + make $(CFLAGS_FOR_TARGET) $(CXXFLAGS_FOR_TARGET) \ + AS_FOR_TARGET="${AS}" LD_FOR_TARGET="${LD}" $(PM) make install ln -s gcc $(WD)/bin/cc Modified: branches/udev_update/packages/gcc/vars/vars.sparc64 =================================================================== --- branches/udev_update/packages/gcc/vars/vars.sparc64 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/gcc/vars/vars.sparc64 2006-03-24 14:10:23 UTC (rev 1451) @@ -1 +1,3 @@ -STARTFILE_PREFIX_SPEC_HEADERS= gcc/config/linux.h gcc/config/linux64.h +STARTFILE_PREFIX_SPEC_HEADERS= gcc/config/sparc/linux.h gcc/config/sparc/linux64.h +CFLAGS_FOR_TARGET= CFLAGS_FOR_TARGET="$(GCCTARGET)" +CXXFLAGS_FOR_TARGET= CXXFLAGS_FOR_TARGET="$(GCCTARGET)" Modified: branches/udev_update/packages/glibc/Makefile =================================================================== --- branches/udev_update/packages/glibc/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/glibc/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -13,7 +13,7 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= 82d0487419f1bdbf2dee439c344e89d6af47e558 else -URL-$(FILE)= ftp://sources.redhat.com/pub/glibc/snapshots/$(FILE) +URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= 9c7f190eb9d590a33384a24c3772bd3a13355575 endif @@ -24,10 +24,6 @@ SHA-$(FILE2)= 95d3a98495d4bd7138149fd312db88da56e735db endif -PATCH30= $(DIR)-sparc_tls-1.patch -URL-$(PATCH30)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH30) -SHA-$(PATCH30)= 5100d3728f58bc40f7f61de10c0b7a202b876aa5 - PATCH40= $(DIR)-libgcc_eh-1.patch URL-$(PATCH40)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH40) SHA-$(PATCH40)= 19da4462ee85bc3c0e494d83f459394653a646e2 @@ -41,15 +37,12 @@ PATCH50= $(DIR)-supported_locales-2.patch +include $(CROSSVARS) + # Targets include $(ROOT)/scripts/functions -ifeq ($(LFS-ARCH),sparc64) -STAGE1_DEPS+= $(PATCH30) $(PATCH41) -STAGE2_DEPS+= $(PATCH30) -endif - headers: $(FILE) $(sep_dir_build) @@ -86,10 +79,7 @@ $(sep_dir_build) compile-stage1: - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH40) -ifeq ($(LFS-ARCH),sparc64) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH30) ; patch -Np1 -i ../$(PATCH41) -endif + cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done echo "libc_cv_forced_unwind=yes" > config.cache echo "libc_cv_c_cleanup=yes" >> config.cache ifeq ($(LFS-ARCH),sparc64) @@ -111,10 +101,7 @@ $(sep_dir_build) compile-stage1-32: - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH40) -ifeq ($(LFS-ARCH),sparc64) - cd ../$(DIR) ; patch -Np1 -i ../$(PATCH30) ; patch -Np1 -i ../$(PATCH41) -endif + cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done echo "libc_cv_forced_unwind=yes" > config.cache echo "libc_cv_c_cleanup=yes" >> config.cache BUILD_CC="gcc" CC="$(LFS_TARGET)-gcc $(32FLAGS)" \ Copied: branches/udev_update/packages/glibc/vars (from rev 1444, trunk/packages/glibc/vars) Modified: branches/udev_update/packages/texinfo/Makefile =================================================================== --- branches/udev_update/packages/texinfo/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/texinfo/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -29,7 +29,7 @@ ifndef CROSS ./configure --prefix=$(WD) else - CC="gcc $(64FLAGS)" ./configure --prefix=$(WD) + CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) --host=$(LFS_TARGET) endif make $(PM) make install Modified: branches/udev_update/packages/util-linux/Makefile =================================================================== --- branches/udev_update/packages/util-linux/Makefile 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/packages/util-linux/Makefile 2006-03-24 14:10:23 UTC (rev 1451) @@ -41,6 +41,8 @@ make -C text-utils more else patch -Np1 -i ../$(PATCH31) + cp -v configure configure.orig + sed -e 's@/usr/[EMAIL PROTECTED](WD)/[EMAIL PROTECTED]' configure.orig > configure CC="$${CC} $(64FLAGS)" ./configure make ARCH="" CPU="" -C lib make ARCH="" CPU="" -C mount mount umount Modified: branches/udev_update/vars/vars.sparc64 =================================================================== --- branches/udev_update/vars/vars.sparc64 2006-03-24 13:52:57 UTC (rev 1450) +++ branches/udev_update/vars/vars.sparc64 2006-03-24 14:10:23 UTC (rev 1451) @@ -3,9 +3,11 @@ export CROSS_WD := /cross-tools export 32FLAGS := -m32 -mcpu=ultrasparc -mtune=ultrasparc export 64FLAGS := -m64 -mcpu=ultrasparc -mtune=ultrasparc +export GCCTARGET := -mcpu=ultrasparc -mtune=ultrasparc export CFLAGS := -Os -s export LIB_MAYBE64 := lib64 -export LFS_HOST ?= sparc64-cross-linux-gnu -export LFS_TARGET := sparc64-sun-linux-gnu -export LFS_TARGET32 := sparcv9-sun-linux-gnu +export LFS_HOST ?= sparcv9-cross--linux-gnu +export LFS_TARGET := sparc64-unknown-linux-gnu +export LFS_TARGET32 := sparcv9-unknown-linux-gnu export KERNEL_ARCH := sparc64 +export WHICH := $(CROSS_WD)/bin/which -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
