[gentoo-commits] gentoo commit in src/patchsets/glibc/extra/locale: locale-gen locale-gen.8 locale.gen.5

[Mike Frysinger (vapier)]

vapier      07/12/29 21:34:46

  Modified:             locale-gen locale-gen.8 locale.gen.5
  Log:
  generate a locale-archive by default ... this is much slower at build time as it cannot be done in parallel, but it is much faster at runtime #187658

Revision  Changes    Path
1.24                 src/patchsets/glibc/extra/locale/locale-gen

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale-gen?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale-gen?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale-gen?r1=1.23&r2=1.24

Index: locale-gen
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- locale-gen	22 Jul 2007 21:25:15 -0000	1.23
+++ locale-gen	29 Dec 2007 21:34:46 -0000	1.24
@@ -45,7 +45,7 @@
 }
 show_version() {
 	local Header=""
-	local cvsver="$Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v 1.23 2007/07/22 21:25:15 vapier Exp $"
+	local cvsver="$Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen,v 1.24 2007/12/29 21:34:46 vapier Exp $"
 	cvsver=${cvsver##*locale-gen,v }
 	echo "locale-gen-${cvsver%% *}"
 	exit 0
@@ -53,7 +53,7 @@
 
 
 
-LOCALEDEF_OPTS="--no-archive -c"
+LOCALEDEF_OPTS="-c"
 KEEP=""
 DESTDIR=""
 CONFIG=""
@@ -65,6 +65,7 @@
 JOBS_MAX=1
 QUIET=0
 SET_X=""
+LOCALE_ARCHIVE=true
 while [[ -n $1 ]] ; do
 	case $1 in
 		-k|--keep|--keep-existing) KEEP=$1;;
@@ -118,6 +119,32 @@
 SUPPORTED=${DESTDIR}usr/share/i18n/SUPPORTED
 ALIAS=${DESTDIR}usr/share/locale/locale.alias
 
+#
+# Grab any user options in their config file
+options=$(sed -n \
+	-e '/^[[:space:]]*#%/s:^[[:space:]]*#%[[:space:]]*::p'\
+	"${CONFIG}"
+)
+IFS=$'\n'
+for option in ${options} ; do
+	case ${option} in
+		no-locale-archive)
+			LOCALE_ARCHIVE=false
+			;;
+		*)
+			ewarn "Unrecognized option '${option}'"
+			;;
+	esac
+done
+unset IFS
+
+if ${LOCALE_ARCHIVE} ; then
+	if [[ ${JOBS_MAX} != 1 ]] ; then
+		ewarn "Generating locale-archive: forcing # of jobs to 1"
+		JOBS_MAX=1
+	fi
+fi
+
 [[ -n ${ALL} ]] && CONFIG=${SUPPORTED}
 
 # Extract the location of the locale dir on the fly as `localedef --help` has:



1.4                  src/patchsets/glibc/extra/locale/locale-gen.8

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale-gen.8?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale-gen.8?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale-gen.8?r1=1.3&r2=1.4

Index: locale-gen.8
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale-gen.8,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locale-gen.8	6 Aug 2007 11:45:49 -0000	1.3
+++ locale-gen.8	29 Dec 2007 21:34:46 -0000	1.4
@@ -50,8 +50,7 @@
 \fB\-\-\fR
 To pass custom options directly to the \fBlocaledef\fR utility, end the
 \fBlocale\-gen\fR option list with \-\- and then everything after that will be
-passed on through unmolested (the options \-c \-\-no\-archive are passed by
-default)
+passed on through unmolested (the options \-c are passed by default)
 .SH "AUTHORS"
 .fi
 Mike Frysinger <vapier@g.o>



1.3                  src/patchsets/glibc/extra/locale/locale.gen.5

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale.gen.5?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale.gen.5?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/extra/locale/locale.gen.5?r1=1.2&r2=1.3

Index: locale.gen.5
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/extra/locale/locale.gen.5,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locale.gen.5	28 Dec 2006 19:02:30 -0000	1.2
+++ locale.gen.5	29 Dec 2007 21:34:46 -0000	1.3
@@ -35,6 +35,12 @@
 command will generate all the locales, placing them in
 \fB/usr/lib/locale\fP.
 
+Comments start with the hash mark # and may only be on new lines.
+
+Options start with #% (to preserve backwards compatibility).  The only option
+currently recognized is \fIno-locale-archive\fR.  This will disable generation
+of the locale archive file and instead generate multiple files/directories for
+each locale.
 .SH "SEE ALSO"
 .BR locale-gen (8),
 .BR localedef (1),



-- 
gentoo-commits@g.o mailing list