This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] 18969 - multiple string test failures due to missing locale dependencies


On 09/26/2015 12:24 PM, Mike Frysinger wrote:
On 24 Sep 2015 15:58, Martin Sebor wrote:
--- a/string/Makefile
+++ b/string/Makefile
@@ -75,4 +75,13 @@ ifeq ($(run-built-tests),yes)
   $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
          cmp $^ > $@; \
          $(evaluate-test)
+
+LOCALES = de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 tr_TR.ISO-8859-9
tr_TR.UTF-8
+include ../gen-locales.mk

should this be wrapped in ifeq ($(run-built-tests),yes) ?
-mike

Thanks for looking at the patch.

The patch does insert the whole hunk into an existing block that
is guarded by the conditional (see the line that starts with @@),
although what I suspect really needs to be wrapped is the use of
the gen-locales variable defined in gen-locales.mk. IIUC, whether
or not the include is wrapped shouldn't make a practical difference
since when gen-locales isn't used nothing should depend on the
locales.

FWIW, when I wrote the patch I looked for other makefiles that
include gen-locales.mk for examples. I found just two: one that
includes it unconditionally (benchtests/Makefile) and another
that does so only when run-built-tests is defined to yes
(localedata/Makefile). I went with the latter approach on
the assumption that it's more likely to be correct. But I'd
be happy to be corrected.

Martin


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]