diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2015-12-16 22:44:30 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-16 23:38:59 +0100 |
| commit | 80677e0208c0ab1e2d0ee9846a4b95939cc7b353 (patch) | |
| tree | 1078d0e9e76a6ab6894f926dbbdb5264a64afe22 /package/gnupg2/0004-silence-git-when-not-in-git-tree.patch | |
| parent | 35a8bcfad949a9eb37411c8fad4aef8305f90142 (diff) | |
| download | buildroot-80677e0208c0ab1e2d0ee9846a4b95939cc7b353.tar.gz buildroot-80677e0208c0ab1e2d0ee9846a4b95939cc7b353.zip | |
package/gnupg2: really do not run tests in cross-compilation
gnupg2 still tries to run test even if it tries to avoid it in
cross-compilation.
Really disable running the tests.
Since that requires a complete autoreconf, the existing patch against
configure is turned into a patch against the m4 macro.
since we autoreconf, we slightly patch configure.ac to not emit git
errors on stderr because it is not in a git tree.
[Thomas: rename patch 0000 to 0004, as suggested by Arnout.]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/gnupg2/0004-silence-git-when-not-in-git-tree.patch')
| -rw-r--r-- | package/gnupg2/0004-silence-git-when-not-in-git-tree.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch b/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch new file mode 100644 index 0000000000..5eaefe4bda --- /dev/null +++ b/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch @@ -0,0 +1,26 @@ +configure: silence autoreconf when not in a git tree + +When autoreconfiguring ourside of a git tree, the output is verbose +with git errors. + +Silence that by consigning stderr to oblivion. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +diff -durN gnupg2-2.0.29.orig/configure.ac gnupg2-2.0.29/configure.ac +--- gnupg2-2.0.29.orig/configure.ac 2015-09-08 14:39:24.000000000 +0200 ++++ gnupg2-2.0.29/configure.ac 2015-12-16 18:34:47.099493863 +0100 +@@ -33,11 +33,11 @@ + # flag indicating a development version (mym4_isgit). Note that the + # m4 processing is done by autoconf and not during the configure run. + m4_define([mym4_revision], +- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) ++ m4_esyscmd([git rev-parse --short HEAD 2>/dev/null | tr -d '\n\r'])) + m4_define([mym4_revision_dec], + m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) + m4_define([mym4_betastring], +- m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long|\ ++ m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long 2>/dev/null |\ + awk -F- '$3!=0{print"-beta"$3}'])) + m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) |
