r1272 - in trunk/packages: LFS-BOOK bash less readline reiser4progs tcl texinfo

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Dec 12 21:34:18 PST 2005


Author: alexander
Date: 2005-12-12 22:34:15 -0700 (Mon, 12 Dec 2005)
New Revision: 1272

Modified:
   trunk/packages/LFS-BOOK/Makefile
   trunk/packages/bash/Makefile
   trunk/packages/less/Makefile
   trunk/packages/readline/Makefile
   trunk/packages/reiser4progs/Makefile
   trunk/packages/tcl/Makefile
   trunk/packages/texinfo/Makefile
Log:
LFS package updates

Modified: trunk/packages/LFS-BOOK/Makefile
===================================================================
--- trunk/packages/LFS-BOOK/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/LFS-BOOK/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -6,16 +6,16 @@
 
 # Ensure sources match LFS book for "trunk".  Update along with LFS packages.
 ifeq ($(VRS),trunk)
-REV= 7207
+REV= 7216
 REVPARM= -r $(REV)
 endif
 
 URL= svn://svn.linuxfromscratch.org/LFS/$(VRS)/BOOK
 FIREFOX_CONFIG= $(ROOT)/root/.mozilla/firefox/2qwpcv2u.default/prefs.js
 
-PATCH50= lfs_book-r7207-utf8-1.patch
+PATCH50= lfs_book-r7216-utf8-1.patch
 URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
-SHA-$(PATCH50)= c99d627085ab118b6f2bc8a359f1d4cf2b5ad07c
+SHA-$(PATCH50)= 44b7bb85051a2ec1d6022edf2072743b9f6ba054
 
 # Targets
 

Modified: trunk/packages/bash/Makefile
===================================================================
--- trunk/packages/bash/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/bash/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -1,41 +1,31 @@
 # Bash Makefile
 
 NM= bash
-VRS= 3.0
+VRS= 3.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= eaa39bae5dccf44a48593858009fb3dc01d4346a
+SHA-$(FILE)= 35e8f7eadded3be38df2eb8ac8db094109339d5e
 
 FILE1 = $(NM)-doc-$(VRS).tar.bz2
 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
-SHA-$(FILE1)= ffb7d4920becfc0acc5a4068ab5b5f09300733cf
+SHA-$(FILE1)= 21084bf998eb11b9c30cd6dac72471ee980cc893
 
-PATCH1= $(DIR)-avoid_WCONTINUED-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 3ea7cf640d5bcf5e442654986e53e6a796ba996e
-
-PATCH2= $(DIR)-fixes-3.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= f5dc122edaac230856d208a5787a3b346959a034
-
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(PATCH1)
+stage1: $(FILE)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage1:
 ifndef CROSS
-	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=$(WD) --without-bash-malloc
 else
 	cp -p Makefile.in Makefile.in.orig
 	sed "s at size \$$(Program)@$(LFS_TARGET)-&@g"  Makefile.in.orig > Makefile.in
-	patch -Np1 -i ../$(PATCH1)
 	CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
    	 ./configure --prefix=$(WD) --with-curses \
    	 --without-bash-malloc --host=$(LFS_TARGET)
@@ -48,16 +38,14 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(FILE1) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(FILE1)
 	$(std_build)
-	cp $(SRC)/{$(PATCH2),$(FILE1)} $(LFSSRC)/
+	cp $(SRC)/$(FILE1) $(LFSSRC)/
 
 compile-stage2:
 	unpack ../$(FILE1)
 	sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|" \
 	 Makefile.in
-	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
 ifndef CROSS
 	./configure --prefix=/usr --bindir=/bin --without-bash-malloc \
 	 --with-installed-readline

Modified: trunk/packages/less/Makefile
===================================================================
--- trunk/packages/less/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/less/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -1,12 +1,12 @@
 # Less Makefile 
 
 NM= less
-VRS= 382
+VRS= 394
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= bc10f7d68152725cc7836a75437ac7e1163860de
+SHA-$(FILE)= e8d5cdbd1fbf6fe9bc32e54e2ce957c2ebf68eb5
 
 # Targets
 

Modified: trunk/packages/readline/Makefile
===================================================================
--- trunk/packages/readline/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/readline/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -1,21 +1,13 @@
 # Readline Makefile
 
 NM= readline
-VRS= 5.0
+VRS= 5.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 6df316629de417c16a77a444cc456a3ba949951b
+SHA-$(FILE)= 06fb3e314e43140f8d7d1b5ce1d8cc3f6af151f3
 
-PATCH1= $(DIR)-fixes-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 085d0d973d1a39707c26454db1d414957a85e2d0
-
-PATCH50= $(DIR)-redhat_fixes-1.patch
-URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
-SHA-$(PATCH50)= e3840c242c397e3b8a777043de72e56d8cfa7f18
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -24,20 +16,18 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
+stage2: Makefile $(FILE)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH50)} $(LFSSRC)
+	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH50)
 ifndef CROSS
 	./configure --prefix=/usr --libdir=/lib
 else
 	CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
    	 ./configure --prefix=/usr --libdir=/lib64
 endif
-	make $(PM) SHLIB_XLDFLAGS=-lncurses
+	make $(PM) SHLIB_LIBS=-lncurses
 	make install
 ifndef CROSS
 	chmod 755 /lib/lib{readline,history}.so*

Modified: trunk/packages/reiser4progs/Makefile
===================================================================
--- trunk/packages/reiser4progs/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/reiser4progs/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -23,7 +23,7 @@
 	./configure --prefix=/usr --sbindir=/sbin
 	make $(PM)
 	make install
-	ln -s mkfs.reiser4 /sbin/mkreiser4fs
+	ln -sf mkfs.reiser4 /sbin/mkreiser4fs
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/tcl/Makefile
===================================================================
--- trunk/packages/tcl/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/tcl/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -1,12 +1,12 @@
 # Tcl Makefile
 
 NM= tcl
-VRS= 8.4.11
+VRS= 8.4.12
 DIR= $(NM)$(VRS)
 
 FILE= $(DIR)-src.tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 03b03db90de2815266948db4d0380e16ca07348c
+SHA-$(FILE)= f906b8af7eebc9b8b55ff515666eff275e18756d
 
 # Targets
 
@@ -17,6 +17,7 @@
 	cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-stage1:
+	cd unix ; cp configure configure.orig ; sed "s/relid'/relid/" configure.orig >configure
 ifndef CROSS
 	cd unix ; ./configure --prefix=$(WD)
 else

Modified: trunk/packages/texinfo/Makefile
===================================================================
--- trunk/packages/texinfo/Makefile	2005-12-13 04:21:26 UTC (rev 1271)
+++ trunk/packages/texinfo/Makefile	2005-12-13 05:34:15 UTC (rev 1272)
@@ -9,9 +9,9 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= b19e906f7220294c1e8b087d583c50f5c4d7c420
 
-PATCH1= $(DIR)-tempfile_fix-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= ac721310cbe17f1661173598954d20484be6c767
+PATCH1= $(DIR)-tempfile_fix-2.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
+SHA-$(PATCH1)= c995a67be7a57bd984ec708f4ff71dbe74cbae36
 
 PATCH50= $(DIR)-multibyte-1.patch
 URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)




More information about the livecd mailing list