[lmi-commits] [lmi] master acb5a13 1/2: Specify binary mode for 'md5sum' where it matters

[Greg Chicares]

branch: master
commit acb5a1344a2e1d62bec87213e444dda4049f973a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Specify binary mode for 'md5sum' where it matters
    
    GNU md5sum prints an asterisk (in binary mode) or a space (in text mode)
    before the file name. The default mode varies by platform and must
    therefore be specified when literal output is to be compared. That's
    unfortunate:
      https://lists.gnu.org/archive/html/bug-coreutils/2009-03/msg00364.html
    but changing it would be too disruptive:
      https://lists.gnu.org/archive/html/bug-coreutils/2009-03/msg00383.html
---
 install_miscellanea.make |    4 ++--
 workhorse.make           |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install_miscellanea.make b/install_miscellanea.make
index 677bb20..7e5414f 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -166,7 +166,7 @@ cgicc: $(file_list)
        $(MV) scratch/$(stem)/cgicc/*.h   $(third_party_include_dir)/cgicc/
        $(MKDIR) $(third_party_source_dir)/cgicc
        $(MV) scratch/$(stem)/cgicc/*.cpp $(third_party_source_dir)/cgicc/
-       cd $(destination) && $(MD5SUM) include/cgicc/* src/cgicc/* 
>$(stem).md5sums
+       cd $(destination) && $(MD5SUM) --binary include/cgicc/* src/cgicc/* 
>$(stem).md5sums
        cd $(destination) && $(MD5SUM) --check $(CURDIR)/$(stem).md5sums
        $(SORT) --key=2 --output=$(stem).X                $(stem).md5sums
        $(SORT) --key=2 --output=$(stem).Y $(destination)/$(stem).md5sums
@@ -228,7 +228,7 @@ xmlwrapp: $(file_list)
        $(MV) scratch/$(stem)/src/libxml/* $(third_party_source_dir)/libxml/
        $(MKDIR) $(third_party_source_dir)/libxslt/
        $(MV) scratch/$(stem)/src/libxslt/* $(third_party_source_dir)/libxslt/
-       cd $(destination) && $(MD5SUM) include/xmlwrapp/* include/xsltwrapp/* 
src/libxml/* src/libxslt/* >$(stem).md5sums
+       cd $(destination) && $(MD5SUM) --binary include/xmlwrapp/* 
include/xsltwrapp/* src/libxml/* src/libxslt/* >$(stem).md5sums
        cd $(destination) && $(MD5SUM) --check $(CURDIR)/$(stem).md5sums
        $(SORT) --key=2 --output=$(stem).X                $(stem).md5sums
        $(SORT) --key=2 --output=$(stem).Y $(destination)/$(stem).md5sums
diff --git a/workhorse.make b/workhorse.make
index 7186a06..860ce41 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1056,7 +1056,7 @@ wrap_fardel:
        @$(CP) $(data_dir)/configurable_settings.xml .
        @$(CP) --preserve $(fardel_binaries) $(fardel_files) .
        @$(fardel_date_script)
-       @$(MD5SUM) $(fardel_checksummed_files) >validated.md5
+       @$(MD5SUM) --binary $(fardel_checksummed_files) >validated.md5
        @$(bin_dir)/generate_passkey > passkey
        @$(TAR) \
          --bzip2 \
@@ -1241,7 +1241,7 @@ touchstone_files := \
   $(filter-out $(touchstone_exclusions),$(wildcard $(touchstone_dir)/*))
 
 $(touchstone_md5sums): $(touchstone_files)
-       @cd $(touchstone_dir) && $(MD5SUM) $(notdir $^) > $@
+       @cd $(touchstone_dir) && $(MD5SUM) --binary $(notdir $^) > $@
        @$(SORT) --key=2 --output=$@ $@
 
 testdeck_suffixes    := cns ill ini inix mec gpt
@@ -1295,7 +1295,7 @@ $(testdecks):
          --emit=$(test_emission) \
          --pyx=system_testing \
          --file=$@
-       @$(MD5SUM) $(basename $(notdir $@)).* >> $(system_test_md5sums)
+       @$(MD5SUM) --binary $(basename $(notdir $@)).* >> $(system_test_md5sums)
        @for z in $(dot_test_files); \
          do \
            $(bin_dir)/ihs_crc_comp$(EXEEXT) $$z $(touchstone_dir)/$$z \