Author: alexander
Date: 2005-11-26 20:39:56 -0700 (Sat, 26 Nov 2005)
New Revision: 1163

Modified:
   branches/utf8-newmake/packages/glibc/Makefile
   branches/utf8-newmake/packages/man-pages/Makefile
Log:
Upgraded man-pages, dropped linuxthreads tarball

Modified: branches/utf8-newmake/packages/glibc/Makefile
===================================================================
--- branches/utf8-newmake/packages/glibc/Makefile       2005-11-27 03:33:15 UTC 
(rev 1162)
+++ branches/utf8-newmake/packages/glibc/Makefile       2005-11-27 03:39:56 UTC 
(rev 1163)
@@ -17,10 +17,6 @@
 SHA-$(FILE)= 47753ac9e13fd955c77c3e2b2bbb278d009dcbc5
 endif
 
-FILE1= $(NM)-linuxthreads-2.3.6.tar.bz2
-URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
-SHA-$(FILE1)= 10190168bf948556afdfff46f87f9208402d810f
-
 ifndef CROSS
 FILE2= $(NM)-libidn-$(VRS).tar.bz2
 URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
@@ -70,9 +66,9 @@
         $(WD)/include/bits
 
 ifndef CROSS
-stage1: $(FILE) $(FILE1) $(FILE2)
+stage1: $(FILE) $(FILE2)
        $(sep_dir_build)
-       cp $(SRC)/{$(FILE),$(FILE1)} $(LFSSRC)/
+       cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-stage1:
        cd ../$(DIR) ; unpack ../$(FILE2)
@@ -134,12 +130,11 @@
        'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 ifndef CROSS
-stage2: $(FILE) $(FILE1)
+stage2: $(FILE)
        $(sep_dir_build)
        touch $@
 
 compile-stage2:
-       cd ../$(DIR) ; unpack ../$(FILE1)
        cd ../$(DIR) ; unpack ../$(FILE2)
 # The vi_VN.TCVN locale doesn't work, testcase: "LC_ALL=vi_VN.TCVN bash"
 # Result: the prompt never comes back, CPU utilization is 100%
@@ -153,8 +148,6 @@
        touch /etc/ld.so.conf
        PARALLELMFLAGS="$(PM)" make install
        PARALLELMFLAGS="$(PM)" make localedata/install-locales
-       make -C ../$(DIR)/linuxthreads/man
-       make -C ../$(DIR)/linuxthreads/man install
        cp $(ROOT)/etc/nsswitch.conf /etc
        cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
        cp $(ROOT)/etc/ld.so.conf /etc

Modified: branches/utf8-newmake/packages/man-pages/Makefile
===================================================================
--- branches/utf8-newmake/packages/man-pages/Makefile   2005-11-27 03:33:15 UTC 
(rev 1162)
+++ branches/utf8-newmake/packages/man-pages/Makefile   2005-11-27 03:39:56 UTC 
(rev 1163)
@@ -1,12 +1,12 @@
 # Man-pages Makefile
 
 NM= man-pages
-VRS= 2.13
+VRS= 2.14
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 85eca68ecf1ea9a0eb04d05880874932b2190d94
+SHA-$(FILE)= 5add7e9db97b64281e75e1f0df19e9bc8b234fb0
 
 # Targets
 

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to