← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to .pc/localedata/local-all-no-archive.diff/localedata/Makefile

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/localedata/local-all-no-archive.diff/localedata/Makefile
1
 
# Copyright (C) 1996-2003,2005,2007-2009,2011,2012
2
 
# Free Software Foundation, Inc.
 
1
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
3
2
# This file is part of the GNU C Library.
4
3
 
5
4
# The GNU C Library is free software; you can redistribute it and/or
70
69
# Get $(inst_i18ndir) defined.
71
70
include ../Makeconfig
72
71
 
73
 
# eglibc: ifeq (no,$(cross-compiling))
 
72
ifeq ($(run-built-tests),yes)
74
73
locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
75
74
                     tst_iswctype tst_iswdigit tst_iswgraph            \
76
75
                     tst_iswlower tst_iswprint tst_iswpunct            \
98
97
tests: $(objpfx)mtrace-tst-leaks
99
98
endif
100
99
endif
101
 
# eglibc: endif
 
100
endif
102
101
 
103
102
# Files to install.
104
103
install-others := $(addprefix $(inst_i18ndir)/, \
128
127
CFLAGS-tst-trans.c = -Wno-format
129
128
 
130
129
 
131
 
# eglibc: ifeq (no,$(cross-compiling))
 
130
ifeq ($(run-built-tests),yes)
132
131
# We have to generate locales
133
132
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
134
133
           en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
148
147
$(addprefix $(objpfx),$(CTYPE_FILES)): %: \
149
148
  gen-locale.sh $(common-objpfx)locale/localedef Makefile \
150
149
  $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS))
151
 
        @$(SHELL) -e gen-locale.sh $(common-objpfx)     \
 
150
        @$(SHELL) gen-locale.sh $(common-objpfx)        \
152
151
                 '$(if $(cross-localedef),              \
153
152
                       $(cross-localedef),              \
154
153
                       $(built-program-cmd))'           \
169
168
 
170
169
$(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
171
170
                       $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
172
 
        $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
 
171
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
173
172
          > $@
174
173
$(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \
175
174
                       $(objpfx)sort-test.out \
176
175
                       $(addprefix $(objpfx),$(CTYPE_FILES))
177
 
        $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
 
176
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
178
177
          > $@
179
178
$(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
180
179
                       $(objpfx)sort-test.out \
181
180
                       $(addprefix $(objpfx),$(CTYPE_FILES))
182
 
        $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
 
181
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
183
182
          > $@
184
183
$(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
185
184
                         $(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
186
 
        $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
 
185
        $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
187
186
$(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
188
187
                          $(objpfx)tst-fmon.out \
189
188
                          $(addprefix $(objpfx),$(CTYPE_FILES))
190
 
        $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
 
189
        $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
191
190
$(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
192
191
                        $(addprefix $(objpfx),$(CTYPE_FILES))
193
 
        $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
 
192
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
194
193
$(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
195
194
                         $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
196
195
                         $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \
197
196
                         $(addprefix $(objpfx),$(CTYPE_FILES))
198
 
        $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
 
197
        $(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
199
198
$(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
200
199
                        $(objpfx)sort-test.out \
201
200
                        $(addprefix $(objpfx),$(CTYPE_FILES))
202
 
        $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
 
201
        $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
203
202
$(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
204
203
                        $(objpfx)sort-test.out tst-wctype.input \
205
204
                        $(addprefix $(objpfx),$(CTYPE_FILES))
206
 
        $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
 
205
        $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
207
206
$(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
208
207
                        $(objpfx)sort-test.out \
209
208
                        $(addprefix $(objpfx),$(CTYPE_FILES))
210
 
        $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
 
209
        $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
211
210
$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
212
211
$(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
213
 
# eglibc: endif
 
212
endif
214
213
 
215
214
include SUPPORTED
216
215