components/mutt/patches/fix-version-message.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 18 Jul 2016 08:41:42 -0700
changeset 6427 2005fa2596b7
permissions -rw-r--r--
22089914 Upgrade MUTT to latest version
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6427
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
The Studio C compiler doesn't understand '-v' or '--version' options
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
when doing:
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
  $ mutt -v
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
This problem has been fixed upstream. See:
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
https://dev.mutt.org/trac/ticket/3852
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
--- mutt-1.6.1/Makefile.in.orig	2016-07-08 06:23:52.142383932 -0700
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
+++ mutt-1.6.1/Makefile.in	2016-07-08 11:02:13.004791220 -0700
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
@@ -1306,9 +1306,9 @@
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
 
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
 conststrings.c: txt2c config.status
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
 	( \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
-		$(CC) -v || \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
-		$(CC) --version || \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
-		$(CC) -V || \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
+		($(CC) -v >/dev/null 2>&1 && $(CC) -v) || \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
+		($(CC) --version >/dev/null 2>&1 && $(CC) --version) || \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
+		($(CC) -V >/dev/null 2>&1 && $(CC) -V) || \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
 		echo "unknown compiler"; \
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
 	) 2>&1 | ${srcdir}/txt2c.sh cc_version >conststrings_c
2005fa2596b7 22089914 Upgrade MUTT to latest version
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 	echo "$(CFLAGS)" | ${srcdir}/txt2c.sh cc_cflags >>conststrings_c