r647 - x86/trunk/packages/gcc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Fri Sep 16 21:10:07 PDT 2005


Author: jhuntwork
Date: 2005-09-16 22:10:06 -0600 (Fri, 16 Sep 2005)
New Revision: 647

Modified:
   x86/trunk/packages/gcc/Makefile
Log:
Upgraded to gcc-4.0.1

Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile	2005-09-17 03:51:34 UTC (rev 646)
+++ x86/trunk/packages/gcc/Makefile	2005-09-17 04:10:06 UTC (rev 647)
@@ -2,26 +2,18 @@
 #==============================================================================
 
 NM= gcc
-VRS= 3.4.4
+VRS= 4.0.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= dbe5935c04f799c77b49d6806f9d7db6d9b5cd35
+SHA-$(FILE)= 2152cdf8cc49de6eef27c6c34f2880cc774e6fa1
 
-PATCH1= $(DIR)-no_fixincludes-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 2175d7dd8fa64038cc3e7db1ad57bb2cf0f8c693
+PATCH1= $(DIR)-specs-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH2)= 04d4b7d68bfd6b362e9b75678584641a2dde7c2f
 
-PATCH2= $(DIR)-specs-2.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 946226d5a463e85829b70c922e827c1ce6cd211c
 
-PATCH3= $(DIR)-linkonce-1.patch
-URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
-SHA-$(PATCH3)= 50de9e6d265d191ea0e6877c4152fd1cff78fb2c
-
-
 # Targets
 # =============================================================================
 
@@ -64,7 +56,7 @@
 #
 	@$(OK)
 
-pass2: $(FILE) $(PATCH1) $(PATCH2)
+pass2: $(FILE) $(PATCH1)
 	@$(sep_dir_build)
 	@$(MAKE) clean
 	@cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
@@ -74,8 +66,13 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; \
-	 patch -Np1 -i ../$(PATCH2)
+	@cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \
+	 sed 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g' \
+	 gcc/Makefile.in.orig > gcc/Makefile.in
+	@cd ../$(DIR) ; cp gcc/Makefile.in{,.tmp} && \
+	 sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
+         > gcc/Makefile.in
+	@cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
 	@../$(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++ \
@@ -108,7 +105,7 @@
 	@chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE) $(PATCH1) $(PATCH3)
+stage2: $(FILE)
 	@$(sep_dir_build)
 	@$(MAKE) clean
 	@cp $(SRC)/$(PATCH3) $(LFSSRC)/
@@ -118,9 +115,10 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; \
-	 patch -Np1 -i ../$(PATCH3)
-	@sed -i 's/install_to_$$(INSTALL_DEST) //' ../$(DIR)/libiberty/Makefile.in
+	@cd ../$(DIR) ; sed -i 's/install_to_$(INSTALL_DEST) //' \
+	 libiberty/Makefile.in
+	@cd ../$(DIR) ; sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' \
+	 gcc/Makefile.in
 	@../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
 	 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
 	 --enable-clocale=gnu --enable-languages=c,c++ >../$(DIR)-$@.log 2>&1




More information about the livecd mailing list