mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-15 20:02:10 +02:00
612b647dd1
Reported by Samuel Thibault and Stéphane Raimbault, as the glibc fr_FR locale has recently changed to use the official but variable width abbreviated month names. Other glibc locales also have variable widths. http://sourceware.org/ml/libc-locales/2008-q1/msg00035.html http://sourceware.org/bugzilla/show_bug.cgi?id=9859 * NEWS: Mention the fix * gl/lib/mbsalign.c: A new module to align and truncate a string in a specified number of screen cells, while handling multi-byte characters appropriately. * gl/lib/mbsalign.h: Ditto * gl/modules/mbsalign: Ditto * bootstrap.conf: Reference the new module * src/ls.c (abmon_init): New function, precompute the abbreviated months aligned left in a minimum width column <= 5 screen cells. (align_nstrftime): New function, replace the first %b in the format specification to strftime with the precomputed month string. Note using the cached month strings speeds up `ls -lU` by around 17% on glibc-2.7-2 on linux at least. Also if we implement this function using heap storage rather than automatic storage, and use snprintf instead of strcpy, ls will slow down by 2% and 1% respectively (i.e. a net gain of 14% rather than 17%). * tests/ls/abmon-align: A new test to test ls alignment for various formats and locales * tests/Makefile.am: Reference the new test
196 lines
5.1 KiB
Plaintext
196 lines
5.1 KiB
Plaintext
# Bootstrap configuration.
|
|
|
|
# Copyright (C) 2006-2009 Free Software Foundation, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
# We don't need these modules.
|
|
avoided_gnulib_modules='
|
|
--avoid=canonicalize-lgpl
|
|
--avoid=dummy
|
|
--avoid=lock
|
|
'
|
|
|
|
# These modules are obsolete and can probably be removed soon,
|
|
# but leave them in for now to minimize changes.
|
|
obsolete_gnulib_modules='
|
|
atexit memchr memcmp memcpy memmove memset rename
|
|
strcspn strtod strtol utime
|
|
'
|
|
|
|
# gnulib modules used by this package.
|
|
gnulib_modules="
|
|
$avoided_gnulib_modules
|
|
$obsolete_gnulib_modules
|
|
acl alloca announce-gen argmatch
|
|
argv-iter
|
|
assert
|
|
autobuild
|
|
backupfile base64
|
|
c-strcase c-strtod
|
|
c-strtold calloc canon-host canonicalize chown cloexec
|
|
config-h configmake
|
|
closein closeout
|
|
crypto/md5
|
|
crypto/sha1
|
|
crypto/sha256
|
|
crypto/sha512
|
|
cycle-check
|
|
d-ino d-type diacrit dirfd dirname dup2
|
|
error euidaccess exclude exitfail fchdir fcntl fcntl-safer fdl
|
|
file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu
|
|
fopen-safer
|
|
fprintftime
|
|
fseeko
|
|
fsusage ftruncate
|
|
ftello
|
|
fts getdate getgroups gethrxtime
|
|
gendocs
|
|
getline getloadavg getndelim2 getopt getpagesize getpass-gnu
|
|
gettext gettime gettimeofday getugroups getusershell
|
|
git-version-gen
|
|
gitlog-to-changelog
|
|
gnu-make gnumakefile gnupload
|
|
group-member hard-locale hash hash-pjw host-os human idcache
|
|
ignore-value
|
|
inttostr inttypes isapipe
|
|
lchmod lchown lib-ignore linebuffer link-follow
|
|
long-options lstat malloc
|
|
manywarnings
|
|
mbrtowc
|
|
mbsalign
|
|
mbswidth
|
|
memcasecmp memcmp2 mempcpy
|
|
memrchr mgetgroups
|
|
mkancesdirs mkdir mkdir-p mkstemp mktime modechange
|
|
mountlist mpsort obstack pathmax perl physmem
|
|
posix-shell
|
|
posixtm
|
|
posixver
|
|
progname
|
|
propername
|
|
putenv
|
|
quote quotearg raise readlink areadlink-with-size
|
|
randint
|
|
randperm
|
|
readtokens
|
|
readtokens0 readutmp
|
|
realloc regex rename-dest-slash rmdir rmdir-errno
|
|
root-dev-ino
|
|
rpmatch
|
|
safe-read same
|
|
save-cwd savedir savewd
|
|
selinux-at
|
|
settime sig2str sigaction ssize_t stat-macros
|
|
stat-time stdbool stdlib-safer stpcpy
|
|
stpncpy
|
|
strdup
|
|
strftime
|
|
strpbrk strtoimax strtoumax strverscmp sys_stat timespec tzset
|
|
unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
|
|
uptime
|
|
useless-if-before-free
|
|
userspec utimecmp utimens
|
|
vasprintf-posix
|
|
vc-list-files
|
|
verify version-etc-fsf verror
|
|
warnings
|
|
wcwidth winsz-ioctl winsz-termios write-any-file
|
|
xalloc
|
|
xfreopen
|
|
xgetcwd xgethostname
|
|
xmemcoll xnanosleep
|
|
xprintf
|
|
xprintf-posix
|
|
xstrtod xstrtoimax
|
|
xstrtol xstrtold xstrtoumax yesno
|
|
"
|
|
|
|
# Other locale categories that need message catalogs.
|
|
EXTRA_LOCALE_CATEGORIES=LC_TIME
|
|
|
|
# Additional xgettext options to use. Use "\\\newline" to break lines.
|
|
XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
|
|
--flag=asnprintf:3:c-format\\\
|
|
--flag=asprintf:2:c-format\\\
|
|
--flag=error:3:c-format\\\
|
|
--flag=error_at_line:5:c-format\\\
|
|
--flag=vasnprintf:3:c-format\\\
|
|
--flag=vasprintf:2:c-format\\\
|
|
--flag=verror:3:c-format\\\
|
|
--flag=verror_at_line:5:c-format\\\
|
|
--flag=wrapf:1:c-format\\\
|
|
--flag=xasprintf:1:c-format\\\
|
|
--flag=xfprintf:2:c-format\\\
|
|
--flag=xprintf:1:c-format\\\
|
|
--from-code=UTF-8\\\
|
|
'
|
|
|
|
# Append these, since we use the propername module.
|
|
see_manual='"This is a proper name. See the gettext manual, section Names."'
|
|
see_manual=\'"$see_manual"\'
|
|
XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
|
|
--keyword=proper_name:1,'"$see_manual"'\\\
|
|
--keyword=proper_name_utf8:1,'"$see_manual"'\\\
|
|
'
|
|
|
|
# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
|
|
# appears in configure.ac, exclude some unnecessary files.
|
|
# Without grep's -E option (not portable enough, pre-configure),
|
|
# the following test is ugly. Also, this depends on the existence
|
|
# of configure.ac, not the obsolescent-named configure.in. But if
|
|
# you're using this infrastructure, you should care about such things.
|
|
|
|
gettext_external=0
|
|
grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
|
|
gettext_external=1
|
|
grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
|
|
gettext_external=1
|
|
|
|
if test $gettext_external = 1; then
|
|
# Gettext supplies these files, but we don't need them since
|
|
# we don't have an intl subdirectory.
|
|
excluded_files='
|
|
m4/glibc2.m4
|
|
m4/intdiv0.m4
|
|
m4/lcmessage.m4
|
|
m4/lock.m4
|
|
m4/uintmax_t.m4
|
|
m4/ulonglong.m4
|
|
m4/visibility.m4
|
|
'
|
|
fi
|
|
|
|
gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
|
|
|
|
# Build prerequisites
|
|
buildreq="\
|
|
autoconf 2.61
|
|
automake 1.10b
|
|
autopoint -
|
|
bison -
|
|
gettext -
|
|
git 1.4.4
|
|
gperf -
|
|
gzip -
|
|
makeinfo -
|
|
perl 5.5
|
|
rsync -
|
|
tar -
|
|
"
|
|
|
|
# Automake requires that ChangeLog exist.
|
|
touch ChangeLog
|