[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 01/36] pass --no-archive to localedef when generating locales



From: Denis Barbier <bouzim@gmail.com>
Date: Tue, 11 Apr 2006 18:26:45 -0500

This was part of an svn commit to Debian's glibc-package repository
with the following description:

| Ship a new locales-all package with all supported locales precompiled.
| Both locales and locales-all packages provide a virtual generated-locales
| package.  Packages which currently depends on locales should instead
| depend on 'locales | generated-locales'.  (Closes: #308020)

The fix itself is in upstream history (as 0ecb606c, 2.5-18.1,
2007-07-12) but I suspect that's a misconversion after a cvs
cherry-pick from the fedora branch.  "master" does not include this
fix, while the fedora branch does.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 localedata/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/localedata/Makefile b/localedata/Makefile
index 8f356ec..df2e703 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -226,7 +226,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
 	echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
 	echo -n '...'; \
 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
-	$(LOCALEDEF) --alias-file=../intl/locale.alias \
+	$(LOCALEDEF) --alias-file=../intl/locale.alias --no-archive \
 		     -i locales/$$input -c -f charmaps/$$charset \
 		     $(addprefix --prefix=,$(install_root)) $$locale; \
 	echo ' done'; \
-- 
1.7.5.1


Reply to: