David Champion wrote: > Does the attached patch work on BSD? (Please save to patch, don't use > copy/paste.)
Not sure if something happened while emailing, but the patch didn't have the embedded 0x0D "\r": it got translated to 0x0A "\n". I'm re-attaching the txt2c.sh patch as an app/octet-stream to hopefully preserve the \r. The fixed patch didn't error out on my Linux (GNU sed) system, but we'd need to hear from the reporter. (It didn't generate any output containing \r or \t though.) Also, I'm attaching a possible patch for the Makefile.am. It looks like automake is using this construct for its own compile rules: `test -f 'txt2c.c' || echo '$(srcdir)/'`txt2c.c Does that seem reasonable? -- Kevin J. McCarthy GPG Fingerprint: 8975 A9B3 3AA3 7910 385C 5308 ADEF 7684 8031 6BDA http://www.8t8.us/configs/gpg-key-transition-statement.txt
# HG changeset patch # User Kevin McCarthy <[email protected]> # Date 1438919785 25200 # Thu Aug 06 20:56:25 2015 -0700 # Node ID 92391a77e207fe5c0e231a823660201430235ebb # Parent d036dbdf1f3de2db032c6b18ad2100cdbf053881 Remove non-portable $< from Makefile.am $< isn't portable except in inference rules. diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -91,17 +91,17 @@ noinst_PROGRAMS = $(MUTT_MD5) mutt_dotlock.c: dotlock.c cp $(srcdir)/dotlock.c mutt_dotlock.c # If this fails, we will fall back to the implementation in txt2c.sh txt2c: txt2c.c - -$${NATIVECC-$(CC)} -o $@ $< + -$${NATIVECC-$(CC)} -o $@ `test -f 'txt2c.c' || echo '$(srcdir)/'`txt2c.c conststrings.c: txt2c config.status ( \ $(CC) -v || \ $(CC) --version || \ $(CC) -V || \ echo "unknown compiler"; \ ) 2>&1 | ${srcdir}/txt2c.sh cc_version >conststrings_c
txt2c.patch
Description: Binary data
signature.asc
Description: PGP signature
