r1382 - in trunk/packages: glibc nALFS

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Jan 29 11:43:15 PST 2006


Author: justin
Date: 2006-01-29 12:43:14 -0700 (Sun, 29 Jan 2006)
New Revision: 1382

Modified:
   trunk/packages/glibc/Makefile
   trunk/packages/nALFS/Makefile
Log:
[trunk] Upgraded to nALFS-1.2.6.

Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile	2006-01-26 02:12:54 UTC (rev 1381)
+++ trunk/packages/glibc/Makefile	2006-01-29 19:43:14 UTC (rev 1382)
@@ -79,7 +79,7 @@
 	 --without-gd --with-headers=$(WD)/include --without-selinux
 	PARALLELMFLAGS="$(PM)" make
 	touch $(WD)/etc/ld.so.conf
-	PARALLELMFLAGS="$(PM)" make install
+	make install
 else
 
 stage1: $(STAGE1_DEPS)

Modified: trunk/packages/nALFS/Makefile
===================================================================
--- trunk/packages/nALFS/Makefile	2006-01-26 02:12:54 UTC (rev 1381)
+++ trunk/packages/nALFS/Makefile	2006-01-29 19:43:14 UTC (rev 1382)
@@ -1,16 +1,13 @@
 # nALFS Makefile
 
 NM= nALFS
-VRS= 1.2.4
+VRS= 1.2.6
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= e9847c5830f2b1c5a89fe3bb7fa397648b4099e7
+SHA-$(FILE)= de75056fcfb9d73af6c0fe7fbfc76f3992a320ba
 
-PATCH1= $(DIR)-locale-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
-SHA-$(PATCH1)= c3f4d4fb0584fabad532009c534f65181b7ea926
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -19,11 +16,10 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build) 
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --with-libxml2 \
 	 --with-curl --with-ssl
 	make $(PM)
@@ -32,4 +28,4 @@
 clean:
 	-rm -rf $(DIR)
 
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list