src/patches/glibc/glibc-rh849203.patch

   1 diff -Nrup a/intl/Makefile b/intl/Makefile
   2 --- a/intl/Makefile     2010-05-04 05:27:23.000000000 -0600
   3 +++ b/intl/Makefile     2012-08-17 14:40:00.457226629 -0600
   4 @@ -74,6 +74,16 @@ ifneq (no,$(PERL))
   5  tests: $(objpfx)mtrace-tst-gettext
   6  endif
   7  endif
   8 +
   9 +# Multiple tests use this data.  Create it once to avoid racing and
  10 +# spurious test failures.
  11 +codeset_mo = $(objpfx)domaindir/de_DE/LC_MESSAGES/codeset.mo
  12 +
  13 +$(codeset_mo):
  14 +       $(make-target-directory)
  15 +       msgfmt -o $@T tstcodeset.po
  16 +       mv -f $@T $@
  17 +
  18  $(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out
  19         $(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@
  20  $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext
  21 @@ -83,16 +93,14 @@ $(objpfx)tst-translit.out: tst-translit.
  22         $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
  23  $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
  24         $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
  25 -$(objpfx)tst-codeset.out: tst-codeset.sh $(objpfx)tst-codeset
  26 -       $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
  27 -$(objpfx)tst-gettext3.out: tst-gettext3.sh $(objpfx)tst-gettext3
  28 -       $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/
  29  $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
  30         $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
  31 -$(objpfx)tst-gettext5.out: tst-gettext5.sh $(objpfx)tst-gettext5
  32 -       $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
  33  $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
  34         $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
  35 +
  36 +$(objpfx)tst-codeset.out: $(codeset_mo)
  37 +$(objpfx)tst-gettext3.out: $(codeset_mo)
  38 +$(objpfx)tst-gettext5.out: $(codeset_mo)
  39  endif
  40  endif
  41
  42 @@ -109,6 +117,11 @@ CFLAGS-tst-gettext4.c = -DOBJPFX=\"$(obj
  43  CFLAGS-tst-gettext5.c = -DOBJPFX=\"$(objpfx)\"
  44  CFLAGS-tst-gettext6.c = -DOBJPFX=\"$(objpfx)\"
  45
  46 +LOCPATH-ENV = LOCPATH=$(common-objpfx)localedata
  47 +tst-codeset-ENV = $(LOCPATH-ENV)
  48 +tst-gettext3-ENV = $(LOCPATH-ENV)
  49 +tst-gettext5-ENV = $(LOCPATH-ENV)
  50 +
  51  ifeq ($(have-thread-library),yes)
  52  ifeq (yes,$(build-shared))
  53  $(addprefix $(objpfx),$(multithread-test-srcs)): $(shared-thread-library)
  54 diff -Nrup a/intl/tst-codeset.sh b/intl/tst-codeset.sh
  55 --- a/intl/tst-codeset.sh       2010-05-04 05:27:23.000000000 -0600
  56 +++ b/intl/tst-codeset.sh       1969-12-31 17:00:00.000000000 -0700
  57 @@ -1,43 +0,0 @@
  58 -#! /bin/sh
  59 -# Test of bind_textdomain_codeset.
  60 -# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
  61 -# This file is part of the GNU C Library.
  62 -#
  63 -
  64 -# The GNU C Library is free software; you can redistribute it and/or
  65 -# modify it under the terms of the GNU Lesser General Public
  66 -# License as published by the Free Software Foundation; either
  67 -# version 2.1 of the License, or (at your option) any later version.
  68 -
  69 -# The GNU C Library is distributed in the hope that it will be useful,
  70 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
  71 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  72 -# Lesser General Public License for more details.
  73 -
  74 -# You should have received a copy of the GNU Lesser General Public
  75 -# License along with the GNU C Library; if not, write to the Free
  76 -# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  77 -# 02111-1307 USA.
  78 -
  79 -common_objpfx=$1
  80 -objpfx=$2
  81 -
  82 -LC_ALL=C
  83 -export LC_ALL
  84 -
  85 -# Generate the test data.
  86 -msgfmt -o ${objpfx}codeset.mo.$$ tstcodeset.po || exit
  87 -# Create the domain directories.
  88 -mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES
  89 -# Populate them.
  90 -mv -f ${objpfx}codeset.mo.$$ ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo
  91 -
  92 -GCONV_PATH=${common_objpfx}iconvdata
  93 -export GCONV_PATH
  94 -LOCPATH=${common_objpfx}localedata
  95 -export LOCPATH
  96 -
  97 -${common_objpfx}elf/ld.so --library-path $common_objpfx \
  98 -${objpfx}tst-codeset > ${objpfx}tst-codeset.out
  99 -
 100 -exit $?
 101 diff -Nrup a/intl/tst-gettext3.sh b/intl/tst-gettext3.sh
 102 --- a/intl/tst-gettext3.sh      2010-05-04 05:27:23.000000000 -0600
 103 +++ b/intl/tst-gettext3.sh      1969-12-31 17:00:00.000000000 -0700
 104 @@ -1,44 +0,0 @@
 105 -#! /bin/sh
 106 -# Test that the gettext() results come out in the correct encoding for
 107 -# locales that differ only in their encoding.
 108 -# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
 109 -# This file is part of the GNU C Library.
 110 -#
 111 -
 112 -# The GNU C Library is free software; you can redistribute it and/or
 113 -# modify it under the terms of the GNU Lesser General Public
 114 -# License as published by the Free Software Foundation; either
 115 -# version 2.1 of the License, or (at your option) any later version.
 116 -
 117 -# The GNU C Library is distributed in the hope that it will be useful,
 118 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 119 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 120 -# Lesser General Public License for more details.
 121 -
 122 -# You should have received a copy of the GNU Lesser General Public
 123 -# License along with the GNU C Library; if not, write to the Free
 124 -# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 125 -# 02111-1307 USA.
 126 -
 127 -common_objpfx=$1
 128 -objpfx=$2
 129 -
 130 -LC_ALL=C
 131 -export LC_ALL
 132 -
 133 -# Generate the test data.
 134 -msgfmt -o ${objpfx}codeset.mo.$$ tstcodeset.po || exit
 135 -# Create the domain directories.
 136 -mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES
 137 -# Populate them.
 138 -mv -f ${objpfx}codeset.mo.$$ ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo
 139 -
 140 -GCONV_PATH=${common_objpfx}iconvdata
 141 -export GCONV_PATH
 142 -LOCPATH=${common_objpfx}localedata
 143 -export LOCPATH
 144 -
 145 -${common_objpfx}elf/ld.so --library-path $common_objpfx \
 146 -${objpfx}tst-gettext3 > ${objpfx}tst-gettext3.out
 147 -
 148 -exit $?
 149 diff -Nrup a/intl/tst-gettext5.sh b/intl/tst-gettext5.sh
 150 --- a/intl/tst-gettext5.sh      2010-05-04 05:27:23.000000000 -0600
 151 +++ b/intl/tst-gettext5.sh      1969-12-31 17:00:00.000000000 -0700
 152 @@ -1,43 +0,0 @@
 153 -#! /bin/sh
 154 -# Test that gettext() in multithreaded applications works correctly if
 155 -# different threads operate in different locales referring to the same
 156 -# catalog file but with different encodings.
 157 -# Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
 158 -# This file is part of the GNU C Library.
 159 -#
 160 -
 161 -# The GNU C Library is free software; you can redistribute it and/or
 162 -# modify it under the terms of the GNU Lesser General Public
 163 -# License as published by the Free Software Foundation; either
 164 -# version 2.1 of the License, or (at your option) any later version.
 165 -
 166 -# The GNU C Library is distributed in the hope that it will be useful,
 167 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 168 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 169 -# Lesser General Public License for more details.
 170 -
 171 -# You should have received a copy of the GNU Lesser General Public
 172 -# License along with the GNU C Library; if not, write to the Free
 173 -# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 174 -# 02111-1307 USA.
 175 -
 176 -common_objpfx=$1
 177 -run_program_prefix=$2
 178 -objpfx=$3
 179 -
 180 -LC_ALL=C
 181 -export LC_ALL
 182 -
 183 -# Create the domain directories.
 184 -mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES
 185 -# Populate them.
 186 -msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo tstcodeset.po
 187 -
 188 -GCONV_PATH=${common_objpfx}iconvdata
 189 -export GCONV_PATH
 190 -LOCPATH=${common_objpfx}localedata
 191 -export LOCPATH
 192 -
 193 -${run_program_prefix} ${objpfx}tst-gettext5 > ${objpfx}tst-gettext5.out
 194 -
 195 -exit $?