r302 - in x86/branches/utf8: . packages/glibc

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Jul 7 01:47:01 PDT 2005


Author: alexander
Date: 2005-07-07 02:46:56 -0600 (Thu, 07 Jul 2005)
New Revision: 302

Added:
   x86/branches/utf8/packages/glibc/glibc-2.3.4-dont_test_installation-1.patch
   x86/branches/utf8/packages/glibc/glibc-2.3.4-supported_locales-1.patch
Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/packages/glibc/Makefile
Log:
Finished building the toolchain, moved the "stop-here" flag before coreutils.

Glibc:
* added libidn to Ch6
* Removed useless installation test from Ch6 because it (wrongly) fails
    (maybe it's a better idea to just add libidn to Ch5, but the problem
    is with the test script itself, not with the newly-built glibc)
* Tweaked the list of installed locales
	


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-07 04:45:45 UTC (rev 301)
+++ x86/branches/utf8/Makefile	2005-07-07 08:46:56 UTC (rev 302)
@@ -168,8 +168,8 @@
 	@-mount -f -t tmpfs tmpfs $(MP)/dev/shm
 	@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
 
-pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages stop-here ch-glibc ch-re-adjust-toolchain \
-	ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
+pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages ch-glibc ch-re-adjust-toolchain \
+	ch-binutils ch-gcc stop-here ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
 	ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \
 	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
 

Modified: x86/branches/utf8/packages/glibc/Makefile
===================================================================
--- x86/branches/utf8/packages/glibc/Makefile	2005-07-07 04:45:45 UTC (rev 301)
+++ x86/branches/utf8/packages/glibc/Makefile	2005-07-07 08:46:56 UTC (rev 302)
@@ -6,9 +6,14 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 FILE1= $(NM)-linuxthreads-$(VRS).tar.bz2
+FILE2= $(NM)-libidn-$(VRS).tar.bz2
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(FILE1)
+URL2= http://ftp.gnu.org/gnu/$(NM)/$(FILE2)
 
+PATCH2= $(DIR)-supported_locales-1.patch
+PATCH3= $(DIR)-dont_test_installation-1.patch
+
 # RULES
 
 .PHONY: stage1 chroot stage2 clean
@@ -21,7 +26,7 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(WD)/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
 	 mkdir ../$(NM)-build && cd ../$(NM)-build && \
-	 ../$(DIR)/configure --prefix=$(WD) --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+	 ../$(DIR)/configure --prefix=$(WD) --disable-profile --enable-add-ons=nptl --enable-kernel=2.6.0 \
 	 --with-binutils=$(WD)/bin --without-gd --without-cvs --with-headers=$(WD)/include --disable-selinux && \
 	 PARALLELMFLAGS=-j3 make && if [ ! -d $(WD)/etc ] ; then mkdir $(WD)/etc ; fi && \
 	 touch $(WD)/etc/ld.so.conf && make install $ ; fi
@@ -38,11 +43,15 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(SRC)/$(FILE1) ] ; then $(WGET) $(URL1) && \
 	 mv $(FILE1) $(SRC) ; fi
+	@if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL2) && \
+	 mv $(FILE2) $(SRC) ; fi
 	@if [ ! -f /usr/bin/ldd ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 unpack $(SRC)/$(FILE1) && \
+	 unpack $(SRC)/$(FILE1) && unpack $(SRC)/$(FILE2) && \
+	 patch -Np1 -i ../$(PATCH2) && patch -Np1 -i ../$(PATCH3) && \
 	 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 && \
+	 ../$(DIR)/configure --prefix=/usr --disable-profile --enable-add-ons=nptl,libidn --enable-kernel=2.6.0 \
+	 --without-cvs --libexecdir=/usr/lib/glibc && \
+	 PARALLELMFLAGS=-j3 make && \
 	 touch /etc/ld.so.conf && make install && make localedata/install-locales && \
 	 make -C ../$(DIR)/linuxthreads/man && make -C ../$(DIR)/linuxthreads/man install && \
 	 cp $(ROOT)/etc/nsswitch.conf /etc && \

Added: x86/branches/utf8/packages/glibc/glibc-2.3.4-dont_test_installation-1.patch
===================================================================
--- x86/branches/utf8/packages/glibc/glibc-2.3.4-dont_test_installation-1.patch	2005-07-07 04:45:45 UTC (rev 301)
+++ x86/branches/utf8/packages/glibc/glibc-2.3.4-dont_test_installation-1.patch	2005-07-07 08:46:56 UTC (rev 302)
@@ -0,0 +1,21 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-07-07
+Initial Package Version: 2.3.4
+Upstream Status: Not Submitted
+Origin: Alexander E. Patrakov
+Description: Don't run test-installation.pl because it is meaningless in LFS.
+It tests Ch5 glibc, not Ch6, because toolchain specs still point to the old
+glibc. And, in fact, the interpreter of the test program is
+/tools/lib/ld-linux.so.2.
+
+--- glibc-2.3.4/Makefile.bak	2005-07-07 12:46:48.872805336 +0600
++++ glibc-2.3.4/Makefile	2005-07-07 12:50:22.955259856 +0600
+@@ -120,7 +120,7 @@
+ ifneq (no,$(PERL))
+ ifeq (/usr,$(prefix))
+ ifeq (,$(install_root))
+-	CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
++	echo "Don't forget to re-adjust the toolchain now to point to this glibc."
+ endif
+ endif
+ endif

Added: x86/branches/utf8/packages/glibc/glibc-2.3.4-supported_locales-1.patch
===================================================================
--- x86/branches/utf8/packages/glibc/glibc-2.3.4-supported_locales-1.patch	2005-07-07 04:45:45 UTC (rev 301)
+++ x86/branches/utf8/packages/glibc/glibc-2.3.4-supported_locales-1.patch	2005-07-07 08:46:56 UTC (rev 302)
@@ -0,0 +1,81 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-07-07
+Initial Package Version: 2.3.4
+Upstream Status: Not Submitted
+Origin: Combined RedHat, ALT Linux and Debian changes
+Description: Alters the list of supported locales
+
+Adds some ISO-8859-15 locales (RedHat)
+Adds ru_RU.CP1251 for Windows compatibility (ALT Linux)
+Changes "russian" alias to point to the de-facto ru_RU.KOI8-R standard (Debian)
+Drops obsolete no_NO alias because it doesn't work (RedHat has a fix)
+Drops vi_VN.TCVN because it causes 100% CPU consumption in bash (bash bug?)
+
+--- glibc-2.3.4/localedata/SUPPORTED	2005-07-07 11:19:49.218313432 +0600
++++ glibc-2.3.4/localedata/SUPPORTED	2005-07-07 11:24:56.235639704 +0600
+@@ -63,6 +63,7 @@
+ cy_GB/ISO-8859-14 \
+ da_DK.UTF-8/UTF-8 \
+ da_DK/ISO-8859-1 \
++da_DK.ISO-8859-15/ISO-8859-15 \
+ de_AT.UTF-8/UTF-8 \
+ de_AT/ISO-8859-1 \
+ de_AT at euro/ISO-8859-15 \
+@@ -89,6 +90,7 @@
+ en_DK/ISO-8859-1 \
+ en_GB.UTF-8/UTF-8 \
+ en_GB/ISO-8859-1 \
++en_GB.ISO-8859-15/ISO-8859-15 \
+ en_HK.UTF-8/UTF-8 \
+ en_HK/ISO-8859-1 \
+ en_IE.UTF-8/UTF-8 \
+@@ -103,6 +105,7 @@
+ en_SG/ISO-8859-1 \
+ en_US.UTF-8/UTF-8 \
+ en_US/ISO-8859-1 \
++en_US.ISO-8859-15/ISO-8859-15 \
+ en_ZA.UTF-8/UTF-8 \
+ en_ZA/ISO-8859-1 \
+ en_ZW.UTF-8/UTF-8 \
+@@ -257,6 +260,7 @@
+ ro_RO.UTF-8/UTF-8 \
+ ro_RO/ISO-8859-2 \
+ ru_RU.KOI8-R/KOI8-R \
++ru_RU.CP1251/CP1251 \
+ ru_RU.UTF-8/UTF-8 \
+ ru_RU/ISO-8859-5 \
+ ru_UA.UTF-8/UTF-8 \
+@@ -280,6 +284,7 @@
+ sv_FI at euro/ISO-8859-15 \
+ sv_SE.UTF-8/UTF-8 \
+ sv_SE/ISO-8859-1 \
++sv_SE.ISO-8859-15/ISO-8859-15 \
+ ta_IN/UTF-8 \
+ te_IN/UTF-8 \
+ tg_TJ/KOI8-T \
+@@ -297,7 +302,6 @@
+ ur_PK/UTF-8 \
+ uz_UZ/ISO-8859-1 \
+ uz_UZ at cyrillic/UTF-8 \
+-vi_VN.TCVN/TCVN5712-1 \
+ vi_VN/UTF-8 \
+ wa_BE/ISO-8859-1 \
+ wa_BE at euro/ISO-8859-15 \
+--- glibc-2.3.4/intl/locale.alias	2005-07-07 11:27:25.729913120 +0600
++++ glibc-2.3.4/intl/locale.alias	2005-07-07 11:28:04.749981168 +0600
+@@ -58,14 +58,12 @@
+ korean.euc 	ko_KR.eucKR
+ ko_KR		ko_KR.eucKR
+ lithuanian      lt_LT.ISO-8859-13
+-no_NO		nb_NO.ISO-8859-1
+-no_NO.ISO-8859-1 nb_NO.ISO-8859-1
+ norwegian       nb_NO.ISO-8859-1
+ nynorsk		nn_NO.ISO-8859-1
+ polish          pl_PL.ISO-8859-2
+ portuguese      pt_PT.ISO-8859-1
+ romanian        ro_RO.ISO-8859-2
+-russian         ru_RU.ISO-8859-5
++russian         ru_RU.KOI8-R
+ slovak          sk_SK.ISO-8859-2
+ slovene         sl_SI.ISO-8859-2
+ slovenian       sl_SI.ISO-8859-2




More information about the livecd mailing list