Author: jhuntwork
Date: 2005-07-20 06:13:21 -0600 (Wed, 20 Jul 2005)
New Revision: 394
Modified:
x86/trunk/Makefile
x86/trunk/packages/binutils/Makefile
x86/trunk/packages/bzip2/Makefile
x86/trunk/packages/coreutils/Makefile
x86/trunk/packages/expect/Makefile
x86/trunk/packages/gcc/Makefile
x86/trunk/packages/tcl/Makefile
x86/trunk/scripts/functions
Log:
Updated Makefiles up to bzip2 stage1
Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile 2005-07-20 05:06:42 UTC (rev 393)
+++ x86/trunk/Makefile 2005-07-20 12:13:21 UTC (rev 394)
@@ -168,9 +168,9 @@
tools: pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \
lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
- lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2-scpt \
- lfs-binutils-pass2-scpt lfs-gawk-scpt lfs-coreutils-scpt \
- lfs-bzip2-scpt STOP lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt
\
+ lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \
+ lfs-binutils-pass2 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-texinfo-scpt \
lfs-bash-scpt lfs-m4-scpt lfs-bison-scpt lfs-flex-scpt \
Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile 2005-07-20 05:06:42 UTC (rev
393)
+++ x86/trunk/packages/binutils/Makefile 2005-07-20 12:13:21 UTC (rev
394)
@@ -155,5 +155,6 @@
clean:
@-rm -rf $(DIR)
+ @-rm -rf $(NM)-build
.PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2
Modified: x86/trunk/packages/bzip2/Makefile
===================================================================
--- x86/trunk/packages/bzip2/Makefile 2005-07-20 05:06:42 UTC (rev 393)
+++ x86/trunk/packages/bzip2/Makefile 2005-07-20 12:13:21 UTC (rev 394)
@@ -7,7 +7,7 @@
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8726fce88aeeb11923f2a83225beac37b9a42dab
+SHA-$(FILE)= 8726fce88aeeb11923f2a83225beac37b9a42dab
# Targets
# =============================================================================
Modified: x86/trunk/packages/coreutils/Makefile
===================================================================
--- x86/trunk/packages/coreutils/Makefile 2005-07-20 05:06:42 UTC (rev
393)
+++ x86/trunk/packages/coreutils/Makefile 2005-07-20 12:13:21 UTC (rev
394)
@@ -7,15 +7,15 @@
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 1028755ae0fa9be840576e4837004cf5a9981c45
+SHA-$(FILE)= 1028755ae0fa9be840576e4837004cf5a9981c45
PATCH1= $(DIR)-uname-2.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 15e872e94319b29c3db4e9454d8d87ff3d51999b
+SHA-$(PATCH1)= 15e872e94319b29c3db4e9454d8d87ff3d51999b
PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch
URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 29b8d86879d6e654642b51b86766c7b8b2c53066
+SHA-$(PATCH2)= 29b8d86879d6e654642b51b86766c7b8b2c53066
# Targets
@@ -25,7 +25,7 @@
stage1: $(FILE)
@$(std_build)
- @cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH2)} $(LFSSRC)
+ @cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
@$(call echo_message, Configuring)
@@ -68,6 +68,7 @@
compile-stage2:
@$(call echo_message, Configuring)
+ @cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
#==============================================================================
# Configure commands below \/
#==============================================================================
Modified: x86/trunk/packages/expect/Makefile
===================================================================
--- x86/trunk/packages/expect/Makefile 2005-07-20 05:06:42 UTC (rev 393)
+++ x86/trunk/packages/expect/Makefile 2005-07-20 12:13:21 UTC (rev 394)
@@ -7,7 +7,7 @@
FILE= $(NM)-$(VRS).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= a73530772f9d735e98175c7807efa8e785c5fa60
+SHA-$(FILE)= a73530772f9d735e98175c7807efa8e785c5fa60
PATCH1= $(NM)-$(VRS)-spawn-1.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
@@ -30,7 +30,7 @@
#==============================================================================
@patch -Np1 -i ../$(PATCH1)
@./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
- --with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.9 --with-x=no \
+ --with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --with-x=no \
>../$(DIR)[EMAIL PROTECTED] 2>&1
#
#==Status Messages==========================================
Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile 2005-07-20 05:06:42 UTC (rev 393)
+++ x86/trunk/packages/gcc/Makefile 2005-07-20 12:13:21 UTC (rev 394)
@@ -74,8 +74,8 @@
#==============================================================================
# Configure commands below \/
#==============================================================================
- @patch -Np1 -i ../$(PATCH1)
- @patch -Np1 -i ../$(PATCH2)
+ @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; \
+ patch -Np1 -i ../$(PATCH2)
@../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
--with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \
--enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \
@@ -118,8 +118,8 @@
#==============================================================================
# Configure commands below \/
#==============================================================================
- @patch -Np1 -i ../$(PATCH1)
- @patch -Np1 -i ../$(PATCH3)
+ @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; \
+ patch -Np1 -i ../$(PATCH3)
@sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
@../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --enable-threads=posix --enable-__cxa_atexit \
Modified: x86/trunk/packages/tcl/Makefile
===================================================================
--- x86/trunk/packages/tcl/Makefile 2005-07-20 05:06:42 UTC (rev 393)
+++ x86/trunk/packages/tcl/Makefile 2005-07-20 12:13:21 UTC (rev 394)
@@ -3,11 +3,11 @@
NM= tcl
VRS= 8.4.11
-DIR= $(NM)-$(VRS)
+DIR= $(NM)$(VRS)
FILE= $(DIR)-src.tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 23ba524fc10949ae065e635c02a7e94cfa908c1d
+SHA-$(FILE)= 23ba524fc10949ae065e635c02a7e94cfa908c1d
# Targets
# =============================================================================
Modified: x86/trunk/scripts/functions
===================================================================
--- x86/trunk/scripts/functions 2005-07-20 05:06:42 UTC (rev 393)
+++ x86/trunk/scripts/functions 2005-07-20 12:13:21 UTC (rev 394)
@@ -7,13 +7,13 @@
define echo_message
@echo $(BRW)
- @echo ===========================================================
+ @echo
================================================================================
@echo $(BRW)$(1) $(ORANGE)$(NM)-$(VRS)$(BRW) for target $(ORANGE)[EMAIL
PROTECTED](BRW)
- @echo
===========================================================$(WHITE)
+ @echo
================================================================================$(WHITE)
endef
define OK
- @echo $(GREEN) [ OK ]$(WHITE)
+ @echo $(GREEN)=====================================[ OK
]=====================================$(WHITE)
endef
define std_build
@@ -38,7 +38,7 @@
$(WGET) -c $(2) ; fi
@if echo "$(3) $(SRC)/$(1)" | sha1sum -c - >/dev/null 2>/dev/null ;
then \
echo $(BRW)sha1sum check on $(SRC)/$(1): $(GREEN)[ OK ]$(WHITE); \
- else echo $(BRW)sha1sum check on $(SRC)/$(1): $(RED)[ FAILED
]$(WHITE); fi
+ else echo $(BRW)sha1sum check on $(SRC)/$(1): $(RED)[ FAILED
]$(WHITE); exit 1 ; fi
@ln -s $(SRC)/$(1) .
endef
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
