0001-configure.in-tighten-AIX-test.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From cd7605723eb8e6d8231644f1cf62f1e80badf074 Mon Sep 17 00:00:00 2001
  2. From: Peter Korsgaard <peter@korsgaard.com>
  3. Date: Mon, 20 Aug 2018 15:57:22 +0200
  4. Subject: [PATCH] configure.in: tighten AIX test
  5. Depending on the configuration, the cpp output may contain the string 'yes'
  6. in a comment if built under a path containing 'yes', confusing the _AIX
  7. test:
  8. ${CROSS}-cpp conftest.h
  9. \# 1 "conftest.h"
  10. \# 1 "<built-in>"
  11. \# 1 "<command-line>"
  12. \# 31 "<command-line>"
  13. \# 1 "/home/peko/source/buildroot/output-yes/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/stdc-predef.h" 1 3 4
  14. \# 32 "<command-line>" 2
  15. \# 1 "conftest.txt"
  16. Fix it by only matching on 'yes' on a line by itself.
  17. Upstream-status: submitted to author
  18. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  19. ---
  20. autoconf/configure.in | 2 +-
  21. configure | 2 +-
  22. 2 files changed, 2 insertions(+), 2 deletions(-)
  23. diff --git a/autoconf/configure.in b/autoconf/configure.in
  24. index bd45004..487c42b 100644
  25. --- a/autoconf/configure.in
  26. +++ b/autoconf/configure.in
  27. @@ -86,7 +86,7 @@ AC_PROG_MAKE_SET
  28. dnl AIX needs -lc128
  29. dnl
  30. -AC_EGREP_CPP([yes], [#ifdef _AIX
  31. +AC_EGREP_CPP([^yes$], [#ifdef _AIX
  32. yes
  33. #endif
  34. ], [LIBS="$LIBS -lc128"])
  35. diff --git a/configure b/configure
  36. index 7c11be0..59267b9 100755
  37. --- a/configure
  38. +++ b/configure
  39. @@ -3377,7 +3377,7 @@ yes
  40. _ACEOF
  41. if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  42. - $EGREP "yes" >/dev/null 2>&1; then
  43. + $EGREP "^yes$" >/dev/null 2>&1; then
  44. LIBS="$LIBS -lc128"
  45. fi
  46. rm -f conftest*
  47. --
  48. 2.11.0