Author: jhuntwork
Date: 2005-06-16 14:19:28 -0600 (Thu, 16 Jun 2005)
New Revision: 238
Modified:
trunk/packages/gcc/Makefile
Log:
Fixed unpacking of gcc
Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile 2005-06-16 19:07:06 UTC (rev 237)
+++ trunk/packages/gcc/Makefile 2005-06-16 20:19:28 UTC (rev 238)
@@ -47,7 +47,8 @@
mv $(PATCH1) $(SRC) ; fi
@if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL3) && \
mv $(PATCH2) $(SRC) ; fi
- @if [ ! -f .pass2 ] ; then unpack $(SRC)/$(FILE2) && cd $(DIR) && \
+ @if [ ! -f .pass2 ] ; then unpack $(SRC)/$(FILE1) && \
+ unpack $(SRC)/$(FILE2) && 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 \
@@ -76,8 +77,9 @@
mv $(PATCH3) $(SRC) ; fi
@if [ ! -f $(SRC)/$(FILE3) ] ; then $(WGET) $(URL5) && \
mv $(FILE3) $(SRC) ; fi
- @if [ ! -f /usr/bin/gcc ] ; then unpack $(SRC)/$(FILE2) && \
- cd $(DIR) && patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i
$(SRC)/$(PATCH3) && \
+ @if [ ! -f /usr/bin/gcc ] ; then unpack $(SRC)/$(FILE1) && \
+ unpack $(SRC)/$(FILE2) && 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 \
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
