Author: thomasp
Date: 2005-10-12 12:27:12 -0600 (Wed, 12 Oct 2005)
New Revision: 919
Added:
trunk/etc/ld.so.conf-x86_64
trunk/packages/perl/perl-5.8.7-lib64-1.patch
Modified:
trunk/Makefile
trunk/packages/expect/Makefile
trunk/packages/gcc/Makefile
trunk/packages/glibc/Makefile
trunk/packages/linux-libc-headers/Makefile
trunk/packages/perl/Makefile
trunk/packages/tcl/Makefile
trunk/packages/util-linux/Makefile
trunk/packages/wget/Makefile
trunk/packages/zlib/Makefile
Log:
Removed erroneous --disable-multilib from gcc
Fixed accidental change to zlib sha1sum
Built up temp-tools packages and beginning final-system
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -80,18 +80,22 @@
ifneq ($(LFS-ARCH),x86_64)
export lfsenv := exec env -i HOME=$$HOME CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin
/bin/bash -c
+export chenv-pre-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ '
PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
+
+export chenv-post-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ '
PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
+
else
export crossenv := exec env -i HOME=$$HOME CFLAGS='' CXXFLAGS='' LFS=$(MP)
LC_ALL=POSIX BUILD32='-m32' BUILD64='-m64' PATH=$(CROSS_WD)/bin:/bin:/usr/bin
/bin/bash -c
export lfsenv := exec env -i HOME=$$HOME CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' LFS=$(MP) LC_ALL=POSIX CC='$(LFS_TARGET)-gcc'
CXX='$(LFS_TARGET)-g++' AR='$(LFS_TARGET)-ar' AS='$(LFS_TARGET)-as'
RANLIB='$(LFS_TARGET)-ranlib' LD='$(LFS_TARGET)-ld' STRIP='$(LFS_TARGET)-strip'
BUILD32='-m32' BUILD64='-m64' PATH=$(CROSS_WD)/bin:/bin:/usr/bin /bin/bash -c
+
+export chenv-pre-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' BUILD32='-m32'
BUILD64='-m64' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
+
+export chenv-post-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' BUILD32='-m32'
BUILD64='-m64' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
endif
export lfsbash := set +h && umask 022 && cd $(MKTREE)
-export chenv-pre-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ '
PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
-
-export chenv-post-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ '
PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
-
export chenv-blfs := /usr/bin/env -i HOME=/root CFLAGS='$(CFLAGS)'
TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin
INPUTRC=/etc/inputrc
XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.68.1/catalog.xml
/etc/xml/catalog" PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig /bin/bash -c
# More Environment Variables
@@ -176,6 +180,15 @@
@cp $(ROOT)/scripts/unpack $(CROSS_WD)/bin
@su - lfs -c "$(crossenv) '$(lfsbash) && $(MAKE) cross-tools'"
@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
+ @make prep-chroot
+ @-mkdir $(MP)/etc
+ @install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} $(MP)/etc
+ @-mkdir $(MP)/bin
+ @if [ ! -f $(MP)/bin/bash ] ; then if [ ! -d $(MP) ] ; then \
+ mkdir $(MP)/bin ; fi ; ln -s ${WD}/bin/bash ${MP}/bin/bash ; fi
+ @chroot "$(MP)" $(chenv-pre-bash) 'set +h && \
+ chown -R 0:0 $(WD) $(SRC) $(ROOT) && \
+ cd $(ROOT) && make x86_64-pre-bash $(chbash-pre-bash)'
endif
extend-lfs: prep-chroot
@@ -236,8 +249,8 @@
tools: lfs-binutils-scpt lfs-gcc-scpt lfs-zlib-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-tar-scpt lfs-bash-scpt lfs-util-linux-scpt lfs-wget-scpt
+ @cp /etc/resolv.conf $(WD)/etc
endif
@@ -262,6 +275,11 @@
ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux final-environment
+x86_64-pre-bash: createdirs createfiles popdev lfs-tcl-scpt lfs-expect-scpt \
+ lfs-dejagnu-scpt lfs-perl-scpt lfs-texinfo-scpt ch-linux-libc-headers
+
+x86_64-post-bash:
+
blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
@@ -355,6 +373,12 @@
@-$(WD)/bin/ln -s $(WD)/bin/perl /usr/bin
@-$(WD)/bin/ln -s $(WD)/lib/libgcc_s.so{,.1} /usr/lib
@-$(WD)/bin/ln -s bash /bin/sh
+ifeq ($(LFS-ARCH),x86_64)
+ @-$(WD)/bin/install -d /{,usr/{,local},opt}/lib64
+ @-$(WD)/bin/install -d /usr/lib/locale
+ @-$(WD)/bin/ln -s ../lib/locale /usr/lib64
+ @-$(WD)/bin/ln -s $(WD)/lib64/libgcc_s.so{,.1} /usr/lib64
+endif
createfiles:
@touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
@@ -420,6 +444,9 @@
ch-%: popdev
make -C $(PKG)/$* stage2
+ch-%-32: popdev
+ make -C $(PKG)/$* stage2-32
+
re-adjust-toolchain:
make -C $(PKG)/binutils re-adjust-toolchain
@@ -543,7 +570,7 @@
@rm -f $(ROOT)/prep-chroot
.PHONY: unmount clean_sources scrub clean iso chroot-gvim update-fontsdir \
- final-environment re-adjust-toolchain ch-% lfs-adjust-toolchain \
- lfs-%-scpt lfs-%-pass1 lfs-%-pass2 popdev createfiles createdirs \
+ final-environment re-adjust-toolchain ch-% ch-%-32 lfs-adjust-toolchain
\
+ lfs-%-scpt lfs-%-scpt-32 lfs-%-pass1 lfs-%-pass2 popdev createfiles
createdirs \
gvim %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \
lfs-rm-wget blfs post-bash pre-bash tools pre-wget pre-which
Added: trunk/etc/ld.so.conf-x86_64
===================================================================
--- trunk/etc/ld.so.conf-x86_64 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/etc/ld.so.conf-x86_64 2005-10-12 18:27:12 UTC (rev 919)
@@ -0,0 +1,9 @@
+# Begin /etc/ld.so.conf
+
+/usr/local/lib
+/usr/local/lib64
+/opt/lib
+/opt/lib64
+/usr/X11R6/lib64
+
+# End /etc/ld.so.conf
Modified: trunk/packages/expect/Makefile
===================================================================
--- trunk/packages/expect/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/expect/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -23,8 +23,14 @@
compile-stage1:
patch -Np1 -i ../$(PATCH1)
+ifneq ($(LFS-ARCH),x86_64)
./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
--with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --with-x=no
+else
+ CC="gcc ${BUILD64}" ./configure --prefix=$(WD) --with-tcl=$(WD)/lib64 \
+ --with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --libdir=$(WD)/lib64 \
+ --with-x=no
+endif
make $(PM)
make SCRIPTS="" install
Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/gcc/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -62,9 +62,9 @@
cd ../$(DIR) ; cp configure{,.orig} ; \
sed '/FLAGS_FOR_TARGET.*\/lib\//[EMAIL PROTECTED] ]*/lib/@@g'
configure.orig > configure
../$(DIR)/configure --prefix=$(CROSS_WD) --target=$(LFS_TARGET) \
- --host=$(LFS_HOST) --disable-multilib --with-local-prefix=$(WD) \
- --disable-nls --enable-shared --enable-languages=c,c++ \
- --enable-__cxa_atexit --enable-c99 --enable-long-long
--enable-threads=posix
+ --host=$(LFS_HOST) --with-local-prefix=$(WD) --disable-nls \
+ --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
+ --enable-c99 --enable-long-long --enable-threads=posix
make $(PM) AS_FOR_TARGET="$(CROSS_WD)/bin/$(LFS_TARGET)-as" \
LD_FOR_TARGET="$(CROSS_WD)/bin/$(LFS_TARGET)-ld"
make install
Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/glibc/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -137,6 +137,7 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+ifneq($(LFS-ARCH),x86_64)
stage2: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
$(PATCH6)
$(sep_dir_build)
cp $(SRC)/$(PATCH6) $(LFSSRC)/
@@ -168,8 +169,44 @@
cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
cp $(ROOT)/etc/ld.so.conf /etc
+else
+
+stage2: $(FILE) $(PATCH41)
+ $(sep_dir_build)
+ cp $(SRC)/$(PATCH41) $(LFSSRC)
+
+compile-stage2:
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH41)
+ echo "slibdir=/lib64" >> configparms
+ CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+ ../$(DIR)/configure --prefix=/usr \
+ --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+ --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64
+ PARALLELMFLAGS="$(PM)" make
+ touch /etc/ld.so.conf
+ PARALLELMFLAGS="$(PM)" make install
+ PARALLELMFLAGS="$(PM)" make localedata/install-locales
+ cp $(ROOT)/etc/nsswitch.conf /etc
+ cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
+ cp $(ROOT)/etc/ld.so.conf-x86_64 /etc/ld.so.conf
+endif
+
+stage2-32: $(FILE) $(PATCH41)
+ $(sep_dir_build)
+
+compile-stage2-32:
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH41)
+ CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+ ../$(DIR)/configure --prefix=/usr \
+ --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+ --libexecdir=/usr/lib/glibc --host=$(LFS_TARGET32)
+ PARALLELMFLAGS="$(PM)" make
+ touch /etc/ld.so.conf
+ PARALLELMFLAGS="$(PM)" make install
+
clean:
-rm -rf $(DIR)
-rm -rf $(NM)-build
-.PHONY: compile-headers compile-stage1 compile-stage1-32 clean chroot
compile-stage2
+.PHONY: compile-headers compile-stage1 compile-stage1-32 clean chroot
compile-stage2 \
+ compile-stage2-32
Modified: trunk/packages/linux-libc-headers/Makefile
===================================================================
--- trunk/packages/linux-libc-headers/Makefile 2005-10-11 19:11:45 UTC (rev
918)
+++ trunk/packages/linux-libc-headers/Makefile 2005-10-12 18:27:12 UTC (rev
919)
@@ -49,10 +49,15 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+ifneq ($(LFS-ARCH),x86_64)
stage2: $(FILE)
+else
+stage2: $(FILE) $(PATCH40)
+endif
$(std_build)
compile-stage2:
+ifneq ($(LFS-ARCH),x86_64)
ifeq ($(LFS-ARCH),x86)
cp -Rv include/asm-i386 /usr/include/asm
endif
@@ -66,6 +71,22 @@
chown -R root:root /usr/include/{asm,linux}
find /usr/include/{asm,linux} -type d -exec chmod 755 {} \;
find /usr/include/{asm,linux} -type f -exec chmod 644 {} \;
+else
+ patch -Np1 -i ../$(PATCH40)
+ cp -Rv include/asm-i386 /usr/include/
+ cp -Rv include/asm-x86_64 /usr/include/
+ cp -Rv include/asm-x86_64-biarch /usr/include/asm
+ cp -Rv include/linux /usr/include
+ cp -Rv include/mtd /usr/include
+ cp -Rv include/sound /usr/include
+ cp -Rv include/scsi /usr/include
+ chown -R root:root \
+ /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,sound,scsi}
+ find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,sound,scsi} \
+ -type d -exec chmod 755 {} \;
+ find /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,sound,scsi} \
+ -type f -exec chmod 644 {} \;
+endif
clean:
-rm -rf $(DIR)
Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/perl/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -12,6 +12,8 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= e515154714acdbb1dbdbeb71727649895e26f50d
+PATCH40= $(DIR)-lib64-1.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -22,11 +24,22 @@
compile-stage1:
patch -Np1 -i ../$(PATCH1)
+ifeq ($(LFS-ARCH),x86_64)
+ sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]'
hints/linux.sh
+ patch -Np1 -i ../$(PATCH40)
+ chmod u+w hints/linux.sh
+ echo "installstyle=\"lib64/perl5\"" >> hints/linux.sh
+endif
./configure.gnu --prefix=$(WD) -Dstatic_ext='IO Fcntl POSIX'
make perl utilities
cp perl pod/pod2man $(WD)/bin
+ifneq ($(LFS-ARCH),x86_64)
mkdir -p $(WD)/lib/perl5/$(VRS)
cp -R lib/* $(WD)/lib/perl5/$(VRS)
+else
+ mkdir -p $(WD)/lib64/perl5/$(VRS)
+ cp -R lib/* $(WD)/lib64/perl5/$(VRS)
+endif
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
Added: trunk/packages/perl/perl-5.8.7-lib64-1.patch
===================================================================
--- trunk/packages/perl/perl-5.8.7-lib64-1.patch 2005-10-11 19:11:45 UTC
(rev 918)
+++ trunk/packages/perl/perl-5.8.7-lib64-1.patch 2005-10-12 18:27:12 UTC
(rev 919)
@@ -0,0 +1,27 @@
+diff -Naur perl-5.8.7.orig/Configure perl-5.8.7/Configure
+--- perl-5.8.7.orig/Configure 2005-04-20 16:34:37.000000000 +0000
++++ perl-5.8.7/Configure 2005-06-27 18:38:18.000000000 +0000
+@@ -5930,6 +5930,7 @@
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+ *lib/perl5*) set dflt privlib lib/$package/$version ;;
++*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
+ *) set dflt privlib lib/$version ;;
+ esac
+ eval $prefixit
+@@ -6433,6 +6434,7 @@
+ case "$sitelib" in
+ '') case "$installstyle" in
+ *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
++ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
+ *) dflt=$siteprefix/lib/site_$prog/$version ;;
+ esac
+ ;;
+@@ -6560,6 +6562,7 @@
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$installstyle" in
+ *lib/perl5*)
dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
++ *lib64/perl5*)
dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
+ *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
+ esac
+ ;;
Modified: trunk/packages/tcl/Makefile
===================================================================
--- trunk/packages/tcl/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/tcl/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -17,7 +17,12 @@
cp $(SRC)/$(FILE) $(LFSSRC)/
compile-stage1:
+ifneq ($(LFS-ARCH),x86_64)
cd unix ; ./configure --prefix=$(WD)
+else
+ cd unix ; sed -i '[EMAIL PROTECTED](prefix)/[EMAIL
PROTECTED](prefix)/[EMAIL PROTECTED]' Makefile.in
+ cd unix ; CC="gcc ${BUILD64}" ./configure --prefix=/tools
--libdir=/tools/lib64
+endif
cd unix ; make $(PM)
cd unix ; make install
ln -s tclsh8.4 $(WD)/bin/tclsh
Modified: trunk/packages/util-linux/Makefile
===================================================================
--- trunk/packages/util-linux/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/util-linux/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -40,10 +40,17 @@
ifeq ($(LFS-ARCH),sparc)
patch -Np1 -i ../$(PATCH31)
endif
+ifneq ($(LFS-ARCH),x86_64)
./configure
make -C lib
make -C mount mount umount
make -C text-utils more
+else
+ CC="${CC} ${BUILD64}" ./configure
+ make ARCH="" CPU="" -C lib
+ make ARCH="" CPU="" -C mount mount umount
+ make ARCH="" CPU="" -C text-utils more
+endif
cp mount/{,u}mount text-utils/more $(WD)/bin
chroot:
Modified: trunk/packages/wget/Makefile
===================================================================
--- trunk/packages/wget/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/wget/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -30,8 +30,13 @@
$(std_build)
compile-stage1:
+ifneq ($(LFS-ARCH),x86_64)
./configure --prefix=$(WD) --libdir=$(WD)/lib --without-ssl \
--enable-static --disable-shared
+else
+ ./configure --prefix=$(WD) --host=$(LFS_TARGET) \
+ --without-ssl
+endif
make $(PM)
make install
Modified: trunk/packages/zlib/Makefile
===================================================================
--- trunk/packages/zlib/Makefile 2005-10-11 19:11:45 UTC (rev 918)
+++ trunk/packages/zlib/Makefile 2005-10-12 18:27:12 UTC (rev 919)
@@ -6,7 +6,7 @@
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 967e280f284d02284b0cd8872a8e2e04bfdc7283e
+SHA-$(FILE)= 967e280f284d02284b0cd8872a8e2e04bfdc7283
# Targets
@@ -45,4 +45,4 @@
clean:
-rm -rf $(DIR)
-.PHONY: clean chroot compile-stage2
+.PHONY: compile-stage1 clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
