diff options
| author | Jim Meyering <jim@meyering.net> | 2009-07-29 14:16:03 +0200 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-29 15:58:41 +0100 |
| commit | e6a3836772a6e9a769539b29e9988aaa5f140d40 (patch) | |
| tree | b080253b1378a1de366354b23c333888a997f89c | |
| parent | 4fbd283c67831d8ef0f0b49045b3369f3ce036db (diff) | |
| download | libguestfs-e6a3836772a6e9a769539b29e9988aaa5f140d40.tar.gz libguestfs-e6a3836772a6e9a769539b29e9988aaa5f140d40.tar.xz libguestfs-e6a3836772a6e9a769539b29e9988aaa5f140d40.zip | |
build: avoid locale-specific changes in generated, VC'd file
When I build with LC_ALL=C in my environment,
the all-local rule generates po/POTFILES.in that
is sorted differently from the on that is checked in:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ca01b3d..154915a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,12 +63,11 @@ fish/tilde.c
fish/time.c
inspector/virt-inspector.pl
java/com_redhat_et_libguestfs_GuestFS.c
-ocaml/guestfs_c_actions.c
ocaml/guestfs_c.c
+ocaml/guestfs_c_actions.c
perl/bindtests.pl
-perl/Guestfs.c
-perl/lib/Sys/Guestfs/Lib.pm
perl/lib/Sys/Guestfs.pm
+perl/lib/Sys/Guestfs/Lib.pm
python/guestfs-py.c
ruby/ext/guestfs/_guestfs.c
src/guestfs-actions.c
If we generate that file so that sort always uses the C locale, then,
this type of difference will not arise. Here's the patch to fix the
rule as well as to reflect the change in the generated file:
>From 609e1d1840da25614a7c9e8954e5356050c9f2ad Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Wed, 29 Jul 2009 08:13:35 -0400
Subject: [PATCH] build: avoid locale-specific changes in generated, VC'd file
* Makefile.am (all-local): Use LC_ALL=C to sort in C locale.
* po/POTFILES.in: Regenerate.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index f118291f..3cba8bc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -165,7 +165,7 @@ all-local: grep -v 'examples/' | \ grep -v '/guestfs_protocol.c' | \ grep -v '/rc_protocol.c' | \ - sort | \ + LC_ALL=C sort | \ sed 's,^\./,,' > po/POTFILES.in # Pkgconfig. diff --git a/po/POTFILES.in b/po/POTFILES.in index ca01b3da..154915a5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -63,12 +63,11 @@ fish/tilde.c fish/time.c inspector/virt-inspector.pl java/com_redhat_et_libguestfs_GuestFS.c -ocaml/guestfs_c_actions.c ocaml/guestfs_c.c +ocaml/guestfs_c_actions.c perl/bindtests.pl -perl/Guestfs.c -perl/lib/Sys/Guestfs/Lib.pm perl/lib/Sys/Guestfs.pm +perl/lib/Sys/Guestfs/Lib.pm python/guestfs-py.c ruby/ext/guestfs/_guestfs.c src/guestfs-actions.c |