r85 - in trunk: . packages/flex packages/gettext

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Apr 16 09:33:31 PDT 2005


Author: jhuntwork
Date: 2005-04-16 10:33:29 -0600 (Sat, 16 Apr 2005)
New Revision: 85

Modified:
   trunk/Makefile
   trunk/packages/flex/Makefile
   trunk/packages/gettext/Makefile
Log:
Fixed gettext instructions, race condition in Flex instructions, and initial bin/bash link

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-04-16 05:50:02 UTC (rev 84)
+++ trunk/Makefile	2005-04-16 16:33:29 UTC (rev 85)
@@ -103,6 +103,7 @@
 	@if [ ! -f $(PKG)/wget/.pass2 ] ; then make lfs-rm-wget && make lfs-wget ; fi
 	@touch $(PKG)/wget/.pass2
 	@make prep-chroot
+	@-mkdir $(MP)/bin
 	@ln -sf ${WD}/bin/bash ${MP}/bin/bash
 	@chroot "$(MP)" $(chenv1) 'set +h && chown -R 0:0 $(WD) $(SRC) $(ROOT) && cd $(ROOT) && make pre-bash $(chbash1)'
 	@chroot "$(MP)" $(chenv2) 'set +h && cd $(ROOT) && make post-bash $(chbash2)'

Modified: trunk/packages/flex/Makefile
===================================================================
--- trunk/packages/flex/Makefile	2005-04-16 05:50:02 UTC (rev 84)
+++ trunk/packages/flex/Makefile	2005-04-16 16:33:29 UTC (rev 85)
@@ -22,7 +22,7 @@
 	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
 	 mv $(PATCH) $(SRC) ; fi
 	@if [ ! -f $(WD)/bin/flex ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \
+	 patch -Z -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \
 	 ./configure --prefix=$(WD) && make -j3 && make install ; fi
 	@make clean
 

Modified: trunk/packages/gettext/Makefile
===================================================================
--- trunk/packages/gettext/Makefile	2005-04-16 05:50:02 UTC (rev 84)
+++ trunk/packages/gettext/Makefile	2005-04-16 16:33:29 UTC (rev 85)
@@ -18,7 +18,7 @@
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(WD)/bin/gettext ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=$(WD) --disable-libasprintf --disable-csharp && make -j3 && make install ; fi
+	 ./configure --prefix=$(WD) --disable-libasprintf --without-csharp && make -j3 && make install ; fi
 	@make clean
 
 chroot:




More information about the livecd mailing list