Author: ken
Date: 2012-08-21 18:41:55 -0600 (Tue, 21 Aug 2012)
New Revision: 2516

Added:
   trunk/sed/sed-4.2.1-testsuite_fixes-1.patch
Log:
Patch to fix sed utf8 tests with recent glibc.

Added: trunk/sed/sed-4.2.1-testsuite_fixes-1.patch
===================================================================
--- trunk/sed/sed-4.2.1-testsuite_fixes-1.patch                         (rev 0)
+++ trunk/sed/sed-4.2.1-testsuite_fixes-1.patch 2012-08-22 00:41:55 UTC (rev 
2516)
@@ -0,0 +1,46 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2012-08-21
+Initial Package Version: 4.2.1
+Upstream Status: Applied
+Origin: Yuri G. Kudryashov
+Description: Overide LC_ALL instead of LANG so that the four utf8 tests
+will pass with recent versions of glibc.
+
+diff --git a/testsuite/Makefile.tests b/testsuite/Makefile.tests
+index 1f04290..c0910dc 100644
+--- a/testsuite/Makefile.tests
++++ b/testsuite/Makefile.tests
+@@ -34,16 +34,16 @@ y-bracket y-newline insert brackets::
+       @$(RM) [email protected] 
+ 
+ badenc::
+-      LANG=ru_RU.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
++      LC_ALL=ru_RU.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
+               < $(srcdir)/[email protected] | $(TR) -d \\r > [email protected] 
+       $(CMP) $(srcdir)/[email protected] [email protected] 
+-      LANG=it_IT.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
++      LC_ALL=it_IT.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
+               < $(srcdir)/[email protected] | $(TR) -d \\r > [email protected] 
+       $(CMP) $(srcdir)/[email protected] [email protected] 
+-      LANG=en_US.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
++      LC_ALL=en_US.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
+               < $(srcdir)/[email protected] | $(TR) -d \\r > [email protected] 
+       $(CMP) $(srcdir)/[email protected] [email protected] 
+-      LANG=en_GB.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
++      LC_ALL=en_GB.UTF-8 $(TIME) $(SED) -nf $(srcdir)/[email protected] \
+               < $(srcdir)/[email protected] | $(TR) -d \\r > [email protected] 
+       $(CMP) $(srcdir)/[email protected] [email protected] 
+       @$(RM) [email protected] 
+@@ -51,10 +51,10 @@ badenc::
+ # Try with ru_RU.UTF-8.  If it is presumably not installed, see if the current
+ # locale is UTF-8 and run it in the current locale.
+ utf8-1 utf8-2 utf8-3 utf8-4::
+-      echo "LANG=ru_RU.UTF-8" \
++      echo "LC_ALL=ru_RU.UTF-8" \
+         "$(TIME) $(SED) -f $(srcdir)/[email protected]" \
+         "< $(srcdir)/[email protected] | $(TR) -d \\r > [email protected]"; \
+-      LANG=ru_RU.UTF-8 \
++      LC_ALL=ru_RU.UTF-8 \
+         $(TIME) $(SED) -f $(srcdir)/[email protected] \
+               < $(srcdir)/[email protected] | $(TR) -d \\r > [email protected]; \
+       $(CMP) $(srcdir)/[email protected] [email protected] && exit 0; \

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

Reply via email to