Author: jhuntwork
Date: 2005-07-18 00:08:38 -0600 (Mon, 18 Jul 2005)
New Revision: 366
Added:
x86/branches/utf8/scripts/ftpget
Modified:
x86/branches/utf8/Makefile
x86/branches/utf8/packages/binutils/Makefile
x86/branches/utf8/packages/gcc/Makefile
x86/branches/utf8/scripts/functions
Log:
Merged -r358 from trunk to utf8
Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile 2005-07-18 06:07:36 UTC (rev 365)
+++ x86/branches/utf8/Makefile 2005-07-18 06:08:38 UTC (rev 366)
@@ -119,7 +119,8 @@
@-ln -nsf $(MP)$(ROOT) /
@-ln -nsf $(MP)$(LFSSRC) /
@-make unamemod
- @-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin $(SRC) $(MP)$(SRC) $(MKTREE)
+ @-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin \
+ $(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 \
Modified: x86/branches/utf8/packages/binutils/Makefile
===================================================================
--- x86/branches/utf8/packages/binutils/Makefile 2005-07-18 06:07:36 UTC
(rev 365)
+++ x86/branches/utf8/packages/binutils/Makefile 2005-07-18 06:08:38 UTC
(rev 366)
@@ -6,6 +6,7 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL= $(HTTP)/$(NM)/$(FILE)
+SHA= 5c80fd5657da47efc16a63fdd93ef7395319fbbf
# Targets
# =============================================================================
@@ -13,8 +14,7 @@
include $(ROOT)/scripts/functions
$(FILE):
- @cd $(SRC) ; $(WGET) $(FILE)
- @ln -s $(SRC)/$(FILE) .
+ @$(call download,$(FILE),$(URL),$(SHA))
pass1: Makefile $(FILE)
@unpack $(FILE)
@@ -79,7 +79,7 @@
# Configure commands below \/
#==============================================================================
@$(sep_dir)
- @./configure --prefix=$(WD) --disable-nls \
+ @../$(DIR)/configure --prefix=$(WD) --disable-nls \
--enable-shared --with-lib-path=$(WD)/lib >../$(DIR)[EMAIL PROTECTED]
#
#==Status Messages==========================================
@@ -135,7 +135,7 @@
# Configure commands below \/
#==============================================================================
@$(sep_dir)
- @./configure --prefix=/usr --enable-shared >../$(DIR)[EMAIL PROTECTED]
+ @../$(DIR)/configure --prefix=/usr --enable-shared >../$(DIR)[EMAIL
PROTECTED]
#
#==Status Messages==========================================
#
Modified: x86/branches/utf8/packages/gcc/Makefile
===================================================================
--- x86/branches/utf8/packages/gcc/Makefile 2005-07-18 06:07:36 UTC (rev
365)
+++ x86/branches/utf8/packages/gcc/Makefile 2005-07-18 06:08:38 UTC (rev
366)
@@ -1,80 +1,161 @@
-# GCC Makefile
+# Gcc Makefile
+#==============================================================================
-# Package versions
NM= gcc
-VRS= 3.4.3
+VRS= 3.4.4
DIR= $(NM)-$(VRS)
-FILE= $(NM)-$(VRS).tar.bz2
-PATCH1= $(NM)-$(VRS)-no_fixincludes-1.patch
-PATCH2= $(NM)-$(VRS)-specs-2.patch
-PATCH3= $(NM)-$(VRS)-linkonce-1.patch
+FILE= $(DIR).tar.bz2
+PATCH1= $(DIR)-no_fixincludes-1.patch
+PATCH2= $(DIR)-specs-2.patch
+PATCH3= $(DIR)-linkonce-1.patch
URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
-URL2= $(HTTP)/$(NM)/$(PATCH2)
-URL3= $(HTTP)/$(NM)/$(PATCH3)
+URL1= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
+URL2= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH2)
+URL3= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH3)
-# RULES
+# Targets
+# =============================================================================
-.PHONY: pass1 pass2 clean chroot stage2
+include $(ROOT)/scripts/functions
-pass1:
- @echo ""
- @echo "=====> Building $(NM) Pass 1"
- @echo ""
- @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
- @if [ ! -f $(WD)/bin/$(NM) ] ; then unpack $(SRC)/$(FILE) && cd $(DIR)
&& \
- mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib
--with-local-prefix=$(WD) \
- --disable-nls --enable-shared --enable-languages=c && \
- make -j3 bootstrap && \
- make install && ln -s gcc $(WD)/bin/cc ; fi
- @make clean
+$(FILE):
+ @cd $(SRC) ; $(WGET) $(URL)
+ @ln -s $(SRC)/$(FILE) .
-pass2:
- @echo ""
- @echo "=====> Building $(NM) Pass 2"
- @echo ""
- @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
- mv $(FILE) $(SRC) ; fi
- @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
- mv $(PATCH1) $(SRC) ; fi
- @if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
- mv $(PATCH2) $(SRC) ; fi
- @if [ ! -f .pass2 ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
- patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \
- mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(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++ --disable-libstdcxx-pch && \
- make -j3 && make install ; fi
- @make clean
- @touch .pass2
+$(PATCH1):
+ @cd $(SRC) ; $(WGET) $(URL1)
+ @ln -s $(SRC)/$(PATCH1) .
+$(PATCH2):
+ @cd $(SRC) ; $(WGET) $(URL2)
+ @ln -s $(SRC)/$(PATCH2) .
+
+$(PATCH3):
+ @cd $(SRC) ; $(WGET) $(URL3)
+ @ln -s $(SRC)/$(PATCH3) .
+
+pass1: Makefile $(FILE)
+ @$(std_build)
+ @cp $(SRC)/$(FILE) $(LFSSRC)/
+
+compile-pass1:
+ @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @$(sep_dir)
+ @../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
+ --with-local-prefix=$(WD) --disable-nls --enable-shared \
+ --enable-languages=c >../$(DIR)[EMAIL PROTECTED]
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+ @make $(PM) bootstrap >>../$(DIR)[EMAIL PROTECTED]
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+ @make install >>../$(DIR)[EMAIL PROTECTED]
+ ln -s gcc $(WD)/bin/cc
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+
+pass2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+ @$(std_build)
+
+compile-pass2:
+ @$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @patch -Np1 -i ../$(PATCH1)
+ @patch -Np1 -i ../$(PATCH2)
+ @$(sep_dir)
+ @../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
+ --with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \
+ --enable-threads=posix --enabel-__cxa_atexit --enable-languages=c,c++ \
+ --disable-libstdcxx-pch >../$(DIR)[EMAIL PROTECTED]
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+ @make $(PM) >>../$(DIR)[EMAIL PROTECTED]
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+ @$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+ @make install >>../$(DIR)[EMAIL PROTECTED]
+
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+
chroot:
- @chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-gcc $(chbash1)'
+ @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)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
- mv $(PATCH1) $(SRC) ; fi
- @if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
- mv $(PATCH2) $(SRC) ; fi
- @if [ ! -f $(SRC)/$(PATCH3) ] ; then $(WGET) $(URL3) && \
- mv $(PATCH3) $(SRC) ; fi
- @if [ ! -f /usr/bin/gcc ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
- patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH3) && \
- sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in && \
- mkdir ../$(NM)-build && cd ../$(NM)-build && \
- ../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib
--enable-shared --enable-threads=posix \
- --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ &&
\
- make -j3 && make install && ln -s ../usr/bin/cpp /lib && ln -s gcc
/usr/bin/cc ; fi
- @make clean
+stage2: Makefile $(FILE)
+ $(std_build)
+compile-stage2:
+ $(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+ @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]
+#
+#==Status Messages==========================================
+#
+ @$(OK)
+ @$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+ @make $(PM) >>../$(DIR)[EMAIL PROTECTED]
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+ @$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+ @make install >>../$(DIR)[EMAIL PROTECTED]
+ @ln -s ../usr/bin/cpp /lib
+ @ln -s gcc /usr/bin/cc
+#
+#==Status Messages===========================================
+#
+ @$(OK)
+
+
clean:
@-rm -rf $(DIR)
- @-rm -rf $(NM)-build
+
+.PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2
Copied: x86/branches/utf8/scripts/ftpget (from rev 358,
x86/trunk/scripts/ftpget)
Property changes on: x86/branches/utf8/scripts/ftpget
___________________________________________________________________
Name: svn:executable
+ *
Modified: x86/branches/utf8/scripts/functions
===================================================================
--- x86/branches/utf8/scripts/functions 2005-07-18 06:07:36 UTC (rev 365)
+++ x86/branches/utf8/scripts/functions 2005-07-18 06:08:38 UTC (rev 366)
@@ -23,5 +23,17 @@
endef
define sep_dir
+ @if [ -d ../$(NM)-build ] ; then rm -rf ../$(NM)-build ; fi
@mkdir ../$(NM)-build && cd ../$(NM)-build
endef
+
+# This takes the form of 'download [filename] [url] [sha1sum]'
+define download
+ @cd $(SRC) ; if [ ! -f $(1) ] ; then $(WGET) $(2) ; \
+ elif ! echo "$(3) $(SRC)/$(1)" | sha1sum -c - >/dev/null ; then \
+ $(WGET) -c $(2) ; fi
+ @if echo "$(3) $(SRC)/$(1)" | sha1sum -c - >/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
+ @ln -s $(SRC)/$(1) .
+endef
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
