Author: jhuntwork
Date: 2005-07-19 05:20:12 -0600 (Tue, 19 Jul 2005)
New Revision: 380
Modified:
x86/trunk/Makefile
x86/trunk/packages/gcc/Makefile
x86/trunk/packages/glibc/Makefile
Log:
Updated glibc, fixes to gcc
Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile 2005-07-19 10:47:05 UTC (rev 379)
+++ x86/trunk/Makefile 2005-07-19 11:20:12 UTC (rev 380)
@@ -125,8 +125,6 @@
$(LFSSRC) $(MP)$(LFSSRC) $(SRC) $(MP)$(SRC) $(MKTREE)
@cp $(ROOT)/scripts/unpack $(WD)/bin
@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
- @if [ ! -f $(PKG)/wget/.pass2 ] ; then \
- make lfs-rm-wget && make lfs-wget ; fi
@touch $(PKG)/wget/.pass2
@make prep-chroot
@-mkdir $(MP)/bin
@@ -221,12 +219,6 @@
# use only ie, 'make [target]'
#==============================================================================
-lfs-wget: unamemod lfsuser
- @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) pre-wget'"
-
-lfs-rm-wget: unamemod lfsuser
- @su - lfs -c "$(lfsenv) '$(lfsbash) &&rm $(WD)/bin/wget'"
-
# The following takes the form 'make lfs-[package name]-only'
lfs-%-only: unamemod lfsuser
@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-scpt'"
@@ -422,7 +414,7 @@
@-rm lfslivecd-$(VERSION).iso
clean_sources:
- @-rm -rf $(SRC) $(MP)$(SRC)
+ @-rm $(SRC) ; rm -rf $(LFSSRC) $(MP)$(LFSSRC)
@-for i in `ls $(PKG)` ; do rm -rf $(PKG)/$$i/{*.gz,*.bz2,*.zip,*.tgz}
; done
unmount:
Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile 2005-07-19 10:47:05 UTC (rev 379)
+++ x86/trunk/packages/gcc/Makefile 2005-07-19 11:20:12 UTC (rev 380)
@@ -108,7 +108,8 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
stage2: $(FILE) $(PATCH1) $(PATCH3)
- $(sep_dir_build)
+ @$(sep_dir_build)
+ @cp $(SRC)/$(PATCH3) $(LFSSRC)/
compile-stage2:
$(call echo_message, Configuring)
@@ -118,7 +119,6 @@
@patch -Np1 -i ../$(PATCH1)
@patch -Np1 -i ../$(PATCH3)
@sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
- @$(sep_dir)
@../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --enable-threads=posix --enable-__cxa_atexit \
--enable-clocale=gnu --enable-languages=c,c++ >../$(DIR)[EMAIL
PROTECTED] 2>&1
@@ -150,5 +150,6 @@
clean:
@-rm -rf $(DIR)
+ @-rf -rf $(DIR)-build
.PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2
Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile 2005-07-19 10:47:05 UTC (rev 379)
+++ x86/trunk/packages/glibc/Makefile 2005-07-19 11:20:12 UTC (rev 380)
@@ -1,55 +1,121 @@
# Glibc Makefile
+#==============================================================================
-# Package versions
NM= glibc
-VRS= 2.3.4
+VRS= 2.3.5
DIR= $(NM)-$(VRS)
+
FILE= $(DIR).tar.bz2
-FILE1= $(NM)-linuxthreads-$(VRS).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(FILE1)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 465cb1f4708dfa88606379cc1ebecb724c65f027
-# RULES
+FILE2= $(NM)-linuxthreads-$(VRS).tar.bz2
+URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
+SHA-$(FILE2)= bfc44a76a708f905fe9c414162d5efcd3d47355f
-.PHONY: stage1 chroot stage2 clean
+PATCH1= $(DIR)-fix_test-1.patch
+URL-$(PATCH1)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 40656faedabfa072c02225ba7d21fc0e76bbacb3
-stage1:
- @echo ""
- @echo "=====> Building $(NM)"
- @echo ""
- @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
- @if [ ! -f $(WD)/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) &&
\
- mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=$(WD) --disable-profile --enable-add-ons
--enable-kernel=2.6.0 \
- --with-binutils=$(WD)/bin --without-gd --without-cvs
--with-headers=$(WD)/include --disable-selinux && \
- PARALLELMFLAGS=-j3 make && if [ ! -d $(WD)/etc ] ; then mkdir
$(WD)/etc ; fi && \
- touch $(WD)/etc/ld.so.conf && make install $ ; fi
- @make clean
+# Targets
+# =============================================================================
+include $(ROOT)/scripts/functions
+
+stage1: $(FILE) $(PATCH1)
+ @$(sep_dir_build)
+ @cp $(SRC)/$(FILE) $(LFSSRC)/
+
+compile-stage1:
+ @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @patch -Np1 -i ../$(PATCH1)
+ @../$(DIR)/configure --prefix=$(WD) --disable-profile \
+ --enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
+ --without-gd --with-headers=$(WD)/include --without-selinux \
+ >../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+ @PARALLELMFLAGS="$(PM)" make >>../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+ @mkdir $(WD)/etc ; touch $(WD)/etc/ld.so.conf
+ @PARALLELMFLAGS="$(PM)" make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+
chroot:
- @chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-glibc
$(chbash-pre-bash)'
+ @chroot "$(MP)" $(chenv-pre-bash) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2:
- @echo ""
- @echo "=====> Building $(NM) in chroot"
- @echo ""
- @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
- @if [ ! -f $(SRC)/$(FILE1) ] ; then $(WGET) $(URL1) && \
- mv $(FILE1) $(SRC) ; fi
- @if [ ! -f /usr/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
- unpack $(SRC)/$(FILE1) && \
- mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=/usr --disable-profile --enable-add-ons
--enable-kernel=2.6.0 \
- --without-cvs --libexecdir=/usr/lib/glibc && PARALLELMFLAGS=-j3 make
&& \
- touch /etc/ld.so.conf && make install && make
localedata/install-locales && \
- make -C ../$(DIR)/linuxthreads/man && make -C
../$(DIR)/linuxthreads/man install && \
- cp $(ROOT)/etc/nsswitch.conf /etc && \
- cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
&& \
- cp $(ROOT)/etc/ld.so.conf /etc/ld.so.conf ; fi
- @make clean
+stage2: $(FILE) $(FILE2) $(PATCH1)
+ @unpack $(FILE)
+ @cd $(DIR) ; unpack $(FILE2)
+ @rm -rf $(NM)-build
+ @mkdir $(NM)-build
+ @$(MAKE) -C $(NM)-build -f ../Makefile compile-$@
+ @$(MAKE) clean
+ @touch $@
+compile-stage2:
+ $(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @patch -Np1 -i ../$(PATCH1)
+ @../$(DIR)/configure --prefix=/usr --disable-profile \
+ --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
+ >../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+ @PARALLELMFLAGS="$(PM)" make >>../$(DIR)[EMAIL PROTECTED] 2>&1
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+ @$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+ @touch /etc/ld.so.conf
+ @PARALLELMFLAGS="$(PM)" make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
+ @PARALLELMFLAGS="$(PM)" make localedata/install-locales \
+ >>../$(DIR)[EMAIL PROTECTED] 2>&1
+ @make -C ../$(DIR)/linuxthreads/man >>../$(DIR)[EMAIL PROTECTED] 2>&1
+ @make -C ../$(DIR)/linuxthreads/man install >>../$(DIR)[EMAIL
PROTECTED] 2>&1
+ @cp $(ROOT)/etc/nsswitch.conf /etc
+ @cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
+ @cp $(ROOT)/etc/ld.so.conf /etc
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+
+
clean:
- @-rm -rf $(NM)-build
@-rm -rf $(DIR)
+ @-rf -rf $(DIR)-build
+
+.PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
