r339 - in x86/branches/6.1/packages: glibc mktemp vim

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Jul 11 04:24:05 PDT 2005


Author: jhuntwork
Date: 2005-07-11 05:24:04 -0600 (Mon, 11 Jul 2005)
New Revision: 339

Modified:
   x86/branches/6.1/packages/glibc/Makefile
   x86/branches/6.1/packages/mktemp/Makefile
   x86/branches/6.1/packages/vim/Makefile
Log:
Fixed glibc and mktemp patches -- Also temporarily fixed unpacking of vim language pack, failing in the unpack script

Modified: x86/branches/6.1/packages/glibc/Makefile
===================================================================
--- x86/branches/6.1/packages/glibc/Makefile	2005-07-11 05:34:34 UTC (rev 338)
+++ x86/branches/6.1/packages/glibc/Makefile	2005-07-11 11:24:04 UTC (rev 339)
@@ -6,8 +6,10 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 FILE1= $(NM)-linuxthreads-$(VRS).tar.bz2
+PATCH= $(DIR)-fix_test-1.patch
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(FILE1)
+URL2= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH)
 
 # RULES
 
@@ -19,7 +21,10 @@
 	@echo ""
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
+	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL2) && \
+	 mv $(PATCH) $(SRC) ; fi
 	@if [ ! -f $(WD)/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+	 patch -Np1 -i $(SRC)/$(PATCH) && \
 	 mkdir ../$(NM)-build && cd ../$(NM)-build && \
 	 ../$(DIR)/configure --prefix=$(WD) --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
 	 --with-binutils=$(WD)/bin --without-gd --without-cvs --with-headers=$(WD)/include --disable-selinux && \
@@ -38,8 +43,11 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(SRC)/$(FILE1) ] ; then $(WGET) $(URL1) && \
 	 mv $(FILE1) $(SRC) ; fi
+	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL2) && \
+	 mv $(PATCH) $(SRC) ; fi
 	@if [ ! -f /usr/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
 	 unpack $(SRC)/$(FILE1) && \
+	 patch -Np1 -i $(SRC)/$(PATCH) && \
 	 mkdir ../$(NM)-build && cd ../$(NM)-build && \
 	 ../$(DIR)/configure --prefix=/usr --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
 	 --without-cvs --libexecdir=/usr/lib/glibc && PARALLELMFLAGS=-j3 make && \

Modified: x86/branches/6.1/packages/mktemp/Makefile
===================================================================
--- x86/branches/6.1/packages/mktemp/Makefile	2005-07-11 05:34:34 UTC (rev 338)
+++ x86/branches/6.1/packages/mktemp/Makefile	2005-07-11 11:24:04 UTC (rev 339)
@@ -5,7 +5,7 @@
 VRS= 1.5
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-PATCH1= $(DIR)-add_tempfile-1.patch
+PATCH1= $(DIR)-add_tempfile-2.patch
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(PATCH1)
 

Modified: x86/branches/6.1/packages/vim/Makefile
===================================================================
--- x86/branches/6.1/packages/vim/Makefile	2005-07-11 05:34:34 UTC (rev 338)
+++ x86/branches/6.1/packages/vim/Makefile	2005-07-11 11:24:04 UTC (rev 339)
@@ -32,7 +32,7 @@
 	@if [ ! -f $(SRC)/$(LANG_PACK) ] ; then $(WGET) $(URL2) && \
 	 mv $(LANG_PACK) $(SRC) ; fi
 	@if [ ! -f /usr/bin/vi ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 unpack $(SRC)/$(LANG_PACK) --strip-components=1 && \
+	 tar -xjf $(SRC)/$(LANG_PACK) --strip-components=1 && \
 	 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h && \
 	 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h && \
 	 patch -Np1 -i $(SRC)/$(PATCH) && \
@@ -52,7 +52,7 @@
 	@if [ ! -f $(SRC)/$(LANG_PACK) ] ; then $(WGET) $(URL2) && \
 	 mv $(LANG_PACK) $(SRC) ; fi
 	@if [ ! -f /usr/bin/gvim ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 unpack $(SRC)/$(LANG_PACK) --strip-components=1 && \
+	 tar -xjf $(SRC)/$(LANG_PACK) --strip-components=1 && \
 	 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h && \
 	 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h && \
 	 patch -Np1 -i $(SRC)/$(PATCH) && \




More information about the livecd mailing list