From 6e8e09255888c506c8f434b5905f13683f8dcf51 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Mon, 31 Aug 2009 20:26:42 +1000 Subject: [BUILTIN] Add another missing LC_COLLATE to mkbuiltins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On Sat, Aug 15, 2009 at 06:07:16PM +0000, Matthew Burgess wrote: > > My system has Coreutils-7.4 compiled with the i18n patch from > http://cvs.fedoraproject.org/viewvc/devel/coreutils/coreutils-i18n.patch. > > Using this to compile dash, when in an en_GB.UTF-8 locale, I get the following error: > > if gcc -DHAVE_CONFIG_H -I. -I. -I.. -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -Wall -g -O2 -MT eval.o -MD -MP -MF ".deps/eval.Tpo" -c -o eval.o eval.c; \ > then mv -f ".deps/eval.Tpo" ".deps/eval.Po"; else rm -f ".deps/eval.Tpo"; exit 1; fi > eval.c: In function ‘evalcommand’: > eval.c:810: error: ‘EXECCMD’ undeclared (first use in this function) > eval.c:810: error: (Each undeclared identifier is reported only once > eval.c:810: error: for each function it appears in.) > eval.c:812: error: ‘COMMANDCMD’ undeclared (first use in this function) > make[3]: *** [eval.o] Error 1 > > This is because the src/mkbuiltins script ends up generating an incomplete > src/builtins.h file. This, in turn, is caused by 'sort -u -k 3,3' not > working correctly. > > The attached patch fixes/works around things by setting LC_CTYPE=C, thus > overriding the build environment (in a similar manner to the earlier call to > 'sort' in that same script). I've changed it to use LC_COLLATE. Signed-off-by: Herbert Xu --- src/mkbuiltins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/mkbuiltins b/src/mkbuiltins index 977edb4..064cb76 100644 --- a/src/mkbuiltins +++ b/src/mkbuiltins @@ -84,7 +84,7 @@ cat <<\! */ ! -sed 's/ -[a-z]*//' $temp2 | nl -v 0 | sort -u -k 3,3 | +sed 's/ -[a-z]*//' $temp2 | nl -v 0 | LC_COLLATE=C sort -u -k 3,3 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | awk '{ printf "#define %s (builtincmd + %d)\n", $3, $1}' printf '\n#define NUMBUILTINS %d\n' $(wc -l < $temp2) -- cgit 1.4.1 70fc6fbc2bfcf97d4b2&follow=1'>devel/cgit-causal-agency (unfollow)
Commit message (Expand)Author
2021-04-27Update cgit-causal-agency to 2574f086June McEnroe
2021-04-27Update bubger to 1.0aJune McEnroe
2021-03-24Update catgirl to 1.7June McEnroe
2021-03-24Import irc/catgirl from ports svnJune McEnroe
2021-03-24Import security/libretls from ports svnJune McEnroe
2021-03-08Add bubger portJune McEnroe
2021-03-08Update catsit to 1.3June McEnroe
2021-03-08Update imbox to 1.4June McEnroe
2021-02-09Update catgirl to 1.6June McEnroe
2021-02-08Update catsit to 1.2June McEnroe
2021-02-08Update pounce to 2.3June McEnroe
2021-02-04Update cgit-causal-agency to 8e4c63cJune McEnroe
2021-01-20Update cgit-causal-agency to 8a10aa5June McEnroe
2021-01-17Update cgit-causal-agencyJune McEnroe
2021-01-17Update scooper to 1.1June McEnroe
2021-01-17Update catgirl to 1.5 (BONUS WEBISODE)June McEnroe
2021-01-15Update litterbox to 1.7June McEnroe
2021-01-15Update pounce to 2.2June McEnroe
2021-01-15Update catgirl to 1.4June McEnroe
2020-12-28Replace cgit-patched with cgit-causal-agencyJune McEnroe
2020-12-18Add notemap portJune McEnroe
2020-12-15Update libretls to 3.3.1June McEnroe
2020-12-15Update catsit to 1.1June McEnroe
2020-12-15Update pounce to 2.1p1June McEnroe
2020-12-15Add imbox portJune McEnroe
2020-11-24Update pounce to 2.1June McEnroe
2020-11-24Update libretls to 3.3.0June McEnroe
2020-11-17Update catgirl to 1.3June McEnroe
2020-11-17Update libretls to 3.2.2June McEnroe
2020-09-29Update libretls to 3.2.1June McEnroe
2020-09-10Update catgirl to 1.2June McEnroe
2020-09-09Add pounce-palaver portJune McEnroe
2020-09-09Update pounce to 2.0June McEnroe
2020-09-09Update litterbox to 1.6June McEnroe
2020-08-23Add scooper portJune McEnroe
2020-08-23Add catsit portJune McEnroe
2020-08-13Update pounce to 1.4p2June McEnroe
2020-08-11Update pounce to 1.4p1June McEnroe
2020-08-10Add litterbox portJune McEnroe
2020-08-10Add missing USES=pkgconfig to pounceJune McEnroe