Stefano Lattarini wrote:
> On 08/30/2012 07:28 PM, Jim Meyering wrote:
>> Stefano Lattarini wrote:
>>> Several minor cleanups and modernization. Some of them are good
>>> on their own, some are motivated by the will to make a future
>>> support of Automake-NG easier.
>>>
>>> -*-*-*-
>>>
>>> Stefano Lattarini (11):
>>> build: prefer $(AM_CPPFLAGS) over $(INCLUDES)
>>> build: don't list files with unknown suffix in _SOURCES
>>> build: prefer pattern rules over suffix rules
>>> build: enable subdir-objects Automake option globally
>>> tests: prefer AM_TESTS_ENVIRONMENT over TESTS_ENVIRONMENT
>>> tests: remove unused AM_TESTS_ENVIRONMENT entries
>>> build: require Automake >= 1.11.6
>>> maint: make Autoconf version requirement consistent
>>> maint: tighten per version requirement
>>> bootstrap: update to latest, from gnulib
>>> gitignore: reorder as forced by ./bootstrap
>>>
>>> .gitignore | 20 ++--
>>> bootstrap | 267
>>> ++++++++++++++++++++++++++++---------------
>>> bootstrap.conf | 6 +-
>>> configure.ac | 3 +-
>>> include/parted/Makefile.am | 3 +-
>>> libparted/Makefile.am | 2 +-
>>> libparted/fs/Makefile.am | 4 +-
>>> libparted/labels/Makefile.am | 8 +-
>>> parted/Makefile.am | 2 +-
>>> partprobe/Makefile.am | 2 +-
>>> tests/Makefile.am | 7 +-
>>> 11 files changed, 200 insertions(+), 124 deletions(-)
>>
>> Hi Stefano,
>>
>> Thanks for doing all of that.
>> So far I have no complaints.
>> One nit is that I'd already updated to latest gnulib,
>> bootstrap and init.sh (and made the few changes so
>> that syntax-check still passes) but hadn't pushed.
>> That means I'm omitting this patch of yours:
>>
>> bootstrap: update to latest, from gnulib
>>
>> If you have any amendments to make before I push, please speak soon.
>>
> The only nit is that, if you have re-run ./bootstrap after updating
> gnulib, you should already have the modifications to .gitignore
> (just reordering of entries actually) in your tree, so the last patch
> should become unnecessary. OTOH, if that is not the case, we have a
> strange bug in our hands, that is, ./bootstrap updates .gitignore for
> me but not for you; in which case it is probably wiser to still drop
> the last patch, until we understand what is going on.
As you suspected, when I bootstrap using all of your patches
except the last one (that adds to .gitignore), I see no change
induced in .gitignore.
Thus, I have omitted that patch.
For context, here's that change:
This change is autogenerated (resulting from a './bootstrap'
invocation), so there's no need for copyright assignment.
* .gitignore: Reorder several entries.
Copyright-paperwork-exempt: yes
---
.gitignore | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 054d9ea..715612b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,16 @@
/include/parted/timer.h
/include/parted/unit.h
/include/parted/vtoc.h
+/lib/.gitignore
+/lib/arg-nonnull.h
+/lib/c++defs.h
+/lib/charset.alias
+/lib/config.h
+/lib/config.h.in
+/lib/configmake.h
+/lib/glthread/
+/lib/link-warning.h
+/lib/warn-on-use.h
ABOUT-NLS
ChangeLog
GNUmakefile
@@ -43,16 +53,6 @@ cscope.out
doc/C/po/parted.8.pot
doc/pt_BR/parted.8.pt_BR.po
gnulib-tests
-/lib/.gitignore
-/lib/charset.alias
-/lib/config.h
-/lib/config.h.in
-/lib/configmake.h
-/lib/arg-nonnull.h
-/lib/c++defs.h
-/lib/glthread/
-/lib/link-warning.h
-/lib/warn-on-use.h
libparted.pc
libparted/tests/disk
libparted/tests/init.sh
That suggests that bootstrap/gnulib-tool is sorting
those lines via different locales.
Here's what I use:
$ locale
LANG=en_US.UTF-8
LC_CTYPE="C"
LC_NUMERIC="C"
LC_TIME="C"
LC_COLLATE="C"
LC_MONETARY="C"
LC_MESSAGES="C"
LC_PAPER="C"
LC_NAME="C"
LC_ADDRESS="C"
LC_TELEPHONE="C"
LC_MEASUREMENT="C"
LC_IDENTIFICATION="C"
LC_ALL=C
Or maybe it's sorting for you, but somehow failing to sort for me.
