0004-silence-git-when-not-in-git-tree.patch 1.3 KB

1234567891011121314151617181920212223242526
  1. configure: silence autoreconf when not in a git tree
  2. When autoreconfiguring ourside of a git tree, the output is verbose
  3. with git errors.
  4. Silence that by consigning stderr to oblivion.
  5. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  6. diff -durN gnupg2-2.0.29.orig/configure.ac gnupg2-2.0.29/configure.ac
  7. --- gnupg2-2.0.29.orig/configure.ac 2015-09-08 14:39:24.000000000 +0200
  8. +++ gnupg2-2.0.29/configure.ac 2015-12-16 18:34:47.099493863 +0100
  9. @@ -33,11 +33,11 @@
  10. # flag indicating a development version (mym4_isgit). Note that the
  11. # m4 processing is done by autoconf and not during the configure run.
  12. m4_define([mym4_revision],
  13. - m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
  14. + m4_esyscmd([git rev-parse --short HEAD 2>/dev/null | tr -d '\n\r']))
  15. m4_define([mym4_revision_dec],
  16. m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
  17. m4_define([mym4_betastring],
  18. - m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long|\
  19. + m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long 2>/dev/null |\
  20. awk -F- '$3!=0{print"-beta"$3}']))
  21. m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
  22. m4_define([mym4_full_version],[mym4_version[]mym4_betastring])