diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/patches/mutt-store-references.patch | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
| download | guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/mutt-store-references.patch')
| -rw-r--r-- | gnu/packages/patches/mutt-store-references.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/patches/mutt-store-references.patch b/gnu/packages/patches/mutt-store-references.patch index 3b69c7b0bd..77d1680d60 100644 --- a/gnu/packages/patches/mutt-store-references.patch +++ b/gnu/packages/patches/mutt-store-references.patch @@ -2,15 +2,16 @@ By default 'mutt' embeds configure flags and the output of 'gcc -v', which contains the store file name of Bash and GCC. This patch makes sure we don't embed a reference to these in 'mutt'. ---- mutt-1.5.23/txt2c.sh 2015-06-26 22:56:56.500731643 +0200 -+++ mutt-1.5.23/txt2c.sh 2015-06-26 22:57:26.664583900 +0200 +diff --git a/txt2c.sh b/txt2c.sh +index f634bb9..53845cf 100755 +--- a/txt2c.sh ++++ b/txt2c.sh @@ -21,6 +21,8 @@ txt2c_fallback () { echo ";" } +echo "unsigned char $1[] = \"value of '$1' not kept\";" +exit 0 - ./txt2c test </dev/null >/dev/null 2>&1 && - ./txt2c "$1" || - txt2c_fallback "$1" - + if ./txt2c test </dev/null >/dev/null 2>&1; then + ./txt2c "$1" + else |