GNU C Library master sources branch master updated. glibc-2.22-562-g90fe682

carlos@sourceware.org carlos@sourceware.org
Fri Nov 27 15:22:00 GMT 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  90fe682d3067163aa773feecf497ef599429457a (commit)
      from  977a30801f61b7bbc27e8f185c1e7eb49675c60c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=90fe682d3067163aa773feecf497ef599429457a

commit 90fe682d3067163aa773feecf497ef599429457a
Author: Carlos O'Donell <carlos@systemhalted.org>
Date:   Fri Nov 27 10:09:45 2015 -0500

    Rename localedir to complocaledir (bug 14259).
    
    In preparation to fix the --localedir configure argument we must
    move the existing conflicting definition of localedir to a more
    appropriate name. Given that all current internal uses of localedir
    relate to the compiled locales we rename to complocaledir.

diff --git a/ChangeLog b/ChangeLog
index ca4f67f..4146d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2015-11-27  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #14259]
+	* Makeconfig: Rename localedir to complocaledir.
+	Rename inst_localedir to inst_complocaledir.
+	* aclocal.m4: Rename libc_cv_localedir to libc_cv_complocaledir.
+	* config.make.in: Use complocaledir and libc_cv_complocaledir.
+	* configure.ac: Use libc_cv_complocaledir.
+	* configure: Regenerate.
+	* locale/Makefile: Use complocaledir. Rename define -DLOCALEDIR to
+	-DCOMPLOCALEDIR.
+	* locale/findlocale.c: Use COMPLOCALEDIR.
+	* locale/loadarchive.c: Likewise.
+	* locale/programs/locale.c: Likewise.
+	* locale/programs/localedef.c: Likewise.
+	* locale/programs/locarchive.c: Likewise.
+	* localedata/Makefile: Use inst_complocaledir.
+	* sysdeps/gnu/configure: Regenerate.
+	* sysdeps/hppa/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/aarch64/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/mips/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/s390/s390-64/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/x86_64/64/configure: Regenerate.
+	* sysdeps/unix/sysv/linux/x86_64/x32/configure: Regenerate.
+
 2015-11-27  Andrew Senkevich  <andrew.senkevich@intel.com>
 
 	[BZ #19058]
diff --git a/Makeconfig b/Makeconfig
index 3c5d71e..76947c6 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -190,11 +190,12 @@ zonedir = $(datadir)/zoneinfo
 endif
 inst_zonedir = $(install_root)$(zonedir)
 
-# Where to install the locale files.
-ifndef localedir
-localedir = $(libdir)/locale
+# Where to install the compiled binary locale archive and compiled
+# binary locale files.
+ifndef complocaledir
+complocaledir = $(libdir)/locale
 endif
-inst_localedir = $(install_root)$(localedir)
+inst_complocaledir = $(install_root)$(complocaledir)
 
 # Where to install the message catalog data files (which are
 # machine-independent).
diff --git a/aclocal.m4 b/aclocal.m4
index abc34d2..3d64f77 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -296,7 +296,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/$1';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac])
diff --git a/config.make.in b/config.make.in
index ba9c60d..05ed6ec 100644
--- a/config.make.in
+++ b/config.make.in
@@ -12,7 +12,7 @@ datadir = @datadir@
 libdir = @libdir@
 slibdir = @libc_cv_slibdir@
 rtlddir = @libc_cv_rtlddir@
-localedir = @libc_cv_localedir@
+complocaledir = @libc_cv_complocaledir@
 sysconfdir = @libc_cv_sysconfdir@
 libexecdir = @libexecdir@
 rootsbindir = @libc_cv_rootsbindir@
diff --git a/configure b/configure
index 90953f0..5ae092b 100755
--- a/configure
+++ b/configure
@@ -603,7 +603,7 @@ use_ldconfig
 libc_cv_rootsbindir
 libc_cv_localstatedir
 libc_cv_sysconfdir
-libc_cv_localedir
+libc_cv_complocaledir
 libc_cv_rtlddir
 libc_cv_slibdir
 use_nscd
diff --git a/configure.ac b/configure.ac
index cd37433..ab18e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1763,7 +1763,7 @@ fi
 
 AC_SUBST(libc_cv_slibdir)
 AC_SUBST(libc_cv_rtlddir)
-AC_SUBST(libc_cv_localedir)
+AC_SUBST(libc_cv_complocaledir)
 AC_SUBST(libc_cv_sysconfdir)
 AC_SUBST(libc_cv_localstatedir)
 AC_SUBST(libc_cv_rootsbindir)
diff --git a/locale/Makefile b/locale/Makefile
index f1b4343..75afbe1 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -76,12 +76,15 @@ C-translit.h: C-translit.h.in gen-translit.pl
 	$(PERL) gen-translit.pl < $< > $@.tmp
 	mv -f $@.tmp $@
 
-localepath = "$(localedir):$(i18ndir)"
+# The path to the compiled binary locale archive or compiled locales,
+# along with the parent path to the source locales and source
+# charmaps.
+localepath = "$(complocaledir):$(i18ndir)"
 
 # -Iprograms doesn't really belong here, but this gets it at the head
 # of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
 # We need it before the standard -I's to see programs/config.h first.
-locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
+locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
 		  -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
 		  -Iprograms
 
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 9e7df12..b96e593 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden =
    which are somehow addressed.  */
 struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
 
-const char _nl_default_locale_path[] attribute_hidden = LOCALEDIR;
+const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR;
 
 /* Checks if the name is actually present, that is, not NULL and not
    empty.  */
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index 3e18cf0..744b61f 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -42,7 +42,7 @@
 
 
 /* Name of the locale archive file.  */
-static const char archfname[] = LOCALEDIR "/locale-archive";
+static const char archfname[] = COMPLOCALEDIR "/locale-archive";
 
 /* Size of initial mapping window, optimal if large enough to
    cover the header plus the initial locale.  */
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index b1de17f..c8995ad 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -45,7 +45,7 @@
 #include "../locarchive.h"
 #include <programs/xmalloc.h>
 
-#define ARCHIVE_NAME LOCALEDIR "/locale-archive"
+#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive"
 
 /* If set print the name of the category.  */
 static int show_category_name;
@@ -325,9 +325,11 @@ select_dirs (const struct dirent *dirent)
 #endif
 	{
 	  struct stat64 st;
-	  char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1];
+	  char buf[sizeof (COMPLOCALEDIR)
+		   + strlen (dirent->d_name) + 1];
 
-	  stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name);
+	  stpcpy (stpcpy (stpcpy (buf, COMPLOCALEDIR), "/"),
+		  dirent->d_name);
 
 	  if (stat64 (buf, &st) == 0)
 	    mode = st.st_mode;
@@ -444,17 +446,21 @@ write_locales (void)
     first_locale = 0;
 
   /* Now we can look for all files in the directory.  */
-  ndirents = scandir (LOCALEDIR, &dirents, select_dirs, alphasort);
+  ndirents = scandir (COMPLOCALEDIR, &dirents, select_dirs,
+		      alphasort);
   for (cnt = 0; cnt < ndirents; ++cnt)
     {
       /* Test whether at least the LC_CTYPE data is there.  Some
 	 directories only contain translations.  */
-      char buf[sizeof (LOCALEDIR) + strlen (dirents[cnt]->d_name)
-	      + sizeof "/LC_IDENTIFICATION"];
+      char buf[sizeof (COMPLOCALEDIR)
+	       + strlen (dirents[cnt]->d_name)
+	       + sizeof "/LC_IDENTIFICATION"];
       char *enddir;
       struct stat64 st;
 
-      stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"),
+      stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf,
+					       COMPLOCALEDIR),
+					       "/"),
 			       dirents[cnt]->d_name),
 	      "/LC_IDENTIFICATION");
 
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index c8da20b..fd6ca51 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -457,11 +457,11 @@ construct_output_path (char *path)
 	 '/'.  */
       ssize_t n;
       if (normal == NULL)
-	n = asprintf (&result, "%s%s/%s%c",
-		      output_prefix ?: "", LOCALEDIR, path, '\0');
+	n = asprintf (&result, "%s%s/%s%c", output_prefix ?: "",
+		      COMPLOCALEDIR, path, '\0');
       else
 	n = asprintf (&result, "%s%s/%.*s%s%s%c",
-		      output_prefix ?: "", LOCALEDIR,
+		      output_prefix ?: "", COMPLOCALEDIR,
 		      (int) (startp - path), path, normal, endp, '\0');
 
       if (n < 0)
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 345f9b7..5f91d71 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -57,7 +57,7 @@
 
 extern const char *output_prefix;
 
-#define ARCHIVE_NAME LOCALEDIR "/locale-archive"
+#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive"
 
 static const char *locnames[] =
   {
diff --git a/localedata/Makefile b/localedata/Makefile
index ebf6ac9..8406e73 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -199,7 +199,7 @@ $(rtld-prefix) $(common-objpfx)locale/localedef
 install-locales: $(INSTALL-SUPPORTED-LOCALES)
 
 install-locales-dir:
-	$(..)./scripts/mkinstalldirs $(inst_localedir)
+	$(..)./scripts/mkinstalldirs $(inst_complocaledir)
 
 $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
 	@locale=`echo $@ | sed -e 's/^install-//'`; \
diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
index 9239297..71243ad 100644
--- a/sysdeps/gnu/configure
+++ b/sysdeps/gnu/configure
@@ -14,7 +14,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure
index 60230a2..f48472c 100644
--- a/sysdeps/unix/sysv/linux/aarch64/configure
+++ b/sysdeps/unix/sysv/linux/aarch64/configure
@@ -11,7 +11,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
index 83f8b13..2d79f55 100644
--- a/sysdeps/unix/sysv/linux/mips/configure
+++ b/sysdeps/unix/sysv/linux/mips/configure
@@ -420,7 +420,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
@@ -434,7 +434,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib32';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
index 70bb18a..af06970 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/configure b/sysdeps/unix/sysv/linux/s390/s390-64/configure
index 63f4194..7392cdf 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/configure
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/configure b/sysdeps/unix/sysv/linux/sparc/sparc64/configure
index 9e5ea3c..8f88eff 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/configure
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/configure b/sysdeps/unix/sysv/linux/x86_64/64/configure
index 570d328..9d1a8d2 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/configure
+++ b/sysdeps/unix/sysv/linux/x86_64/64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/configure b/sysdeps/unix/sysv/linux/x86_64/x32/configure
index 6ff0f0c..1417da4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/configure
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/configure
@@ -11,7 +11,7 @@ case "$prefix" in
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/libx32';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   27 ++++++++++++++++++++
 Makeconfig                                         |    9 +++---
 aclocal.m4                                         |    2 +-
 config.make.in                                     |    2 +-
 configure                                          |    2 +-
 configure.ac                                       |    2 +-
 locale/Makefile                                    |    7 +++-
 locale/findlocale.c                                |    2 +-
 locale/loadarchive.c                               |    2 +-
 locale/programs/locale.c                           |   20 +++++++++-----
 locale/programs/localedef.c                        |    6 ++--
 locale/programs/locarchive.c                       |    2 +-
 localedata/Makefile                                |    2 +-
 sysdeps/gnu/configure                              |    2 +-
 sysdeps/unix/sysv/linux/aarch64/configure          |    2 +-
 sysdeps/unix/sysv/linux/mips/configure             |    4 +-
 .../unix/sysv/linux/powerpc/powerpc64/configure    |    2 +-
 sysdeps/unix/sysv/linux/s390/s390-64/configure     |    2 +-
 sysdeps/unix/sysv/linux/sparc/sparc64/configure    |    2 +-
 sysdeps/unix/sysv/linux/x86_64/64/configure        |    2 +-
 sysdeps/unix/sysv/linux/x86_64/x32/configure       |    2 +-
 21 files changed, 70 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list