This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
POTFILES.in sorting

From: Alan Modra <amodra at bigpond dot net dot au>
To: binutils at sourceware dot org
Date: Mon, 4 Aug 2008 16:25:45 +0930
Subject: POTFILES.in sorting
Some time ago I committed a patch that was supposed to keep POTFILES.in
sorted consistently.  However, the following extract from the "sort"
info page says:

"Note that setting only `LC_COLLATE' has two problems.
First, it is ineffective if `LC_ALL' is also set.  Second, it has
undefined behavior if `LC_CTYPE' (or `LANG', if `LC_CTYPE' is unset) is
set to an incompatible value."

So, don't use LC_COLLATE but instead LC_ALL=C.

bfd/ChangeLog
	* Makefile.am (SRC-POTFILES.in, BLD-POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.
	* po/SRC-POTFILES.in: Regenerate.

opcodes/ChangeLog
	* Makefile.am (POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Regenerate.

binutils/ChangeLog
	* Makefile.am (POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.

gas/ChangeLog
	* Makefile.am (POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Regenerate.

gprof/ChangeLog
	* Makefile.am (POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.

ld/ChangeLog
	* Makefile.am (POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Regenerate.

gold/ChangeLog
	* Makefile.am (POTFILES.in): Set LC_ALL=C.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Regenerate.

Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.213
diff -u -p -r1.213 Makefile.am
--- bfd/Makefile.am	10 Jul 2008 01:32:21 -0000	1.213
+++ bfd/Makefile.am	4 Aug 2008 05:13:25 -0000
@@ -698,12 +698,12 @@ BLD_POTFILES = $(BUILD_CFILES) $(BUILD_H
 
 po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
 	for file in $(SRC_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.src \
+	  | LC_ALL=C sort > tmp.src \
 	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
 
 po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
 	for file in $(BLD_POTFILES); do echo $$file; done \
-	  | LC_COLLATE= sort > tmp.bld \
+	  | LC_ALL=C sort > tmp.bld \
 	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
 
 all diststuff: info
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile.am
--- binutils/Makefile.am	13 Mar 2008 02:05:19 -0000	1.101
+++ binutils/Makefile.am	4 Aug 2008 05:13:25 -0000
@@ -147,7 +147,7 @@ install-html-recursive:
 
 POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 EXPECT = expect
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile.am
--- gas/Makefile.am	14 May 2008 06:45:41 -0000	1.158
+++ gas/Makefile.am	4 Aug 2008 05:13:26 -0000
@@ -472,7 +472,7 @@ POTFILES = $(MULTI_CFILES) $(CONFIG_ATOF
 	$(OBJ_FORMAT_CFILES) $(TARGET_CPU_HFILES) $(TARGET_CPU_CFILES) \
 	$(HFILES) $(CFILES)
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 # Note: GASP is now deprecated and has been removed.  It is still
Index: gold/Makefile.am
===================================================================
RCS file: /cvs/src/src/gold/Makefile.am,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile.am
--- gold/Makefile.am	25 Jul 2008 04:25:49 -0000	1.41
+++ gold/Makefile.am	4 Aug 2008 05:13:26 -0000
@@ -157,7 +157,7 @@ install-data-local: install-info
 POTFILES= $(CCFILES) $(HFILES) $(TARGETSOURCES)
 
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 # Bootstrap test support.  We use ld-new to build ld1, then use ld1 to
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile.am
--- gprof/Makefile.am	24 Oct 2007 04:56:12 -0000	1.41
+++ gprof/Makefile.am	4 Aug 2008 05:13:26 -0000
@@ -52,7 +52,7 @@ diststuff: $(BUILT_SOURCES) info $(man_M
 
 POTFILES = $(sources) $(noinst_HEADERS)
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 MANCONF  = -Dman
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.250
diff -u -p -r1.250 Makefile.am
--- ld/Makefile.am	3 Aug 2008 03:26:02 -0000	1.250
+++ ld/Makefile.am	4 Aug 2008 05:13:27 -0000
@@ -459,7 +459,7 @@ EMULATION_FILES = emultempl/pe.em emulte
 POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES)
 
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 ldmain.o: ldmain.c config.status
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile.am
--- opcodes/Makefile.am	1 Aug 2008 14:35:06 -0000	1.126
+++ opcodes/Makefile.am	4 Aug 2008 05:13:28 -0000
@@ -393,7 +393,7 @@ libopcodes.a: stamp-lib ; @true
 
 POTFILES = $(HFILES) $(CFILES)
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes
Index: gold/Makefile.am
===================================================================
RCS file: /cvs/src/src/gold/Makefile.am,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile.am
--- gold/Makefile.am	25 Jul 2008 04:25:49 -0000	1.41
+++ gold/Makefile.am	4 Aug 2008 06:28:07 -0000
@@ -157,7 +157,7 @@ install-data-local: install-info
 POTFILES= $(CCFILES) $(HFILES) $(TARGETSOURCES)
 
 po/POTFILES.in: @MAINT@ Makefile
-	for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
+	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 # Bootstrap test support.  We use ld-new to build ld1, then use ld1 to

-- 
Alan Modra
Australia Development Lab, IBM
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]