You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

78 lines
2.2 KiB

  1. From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001
  2. From: Dengke Du <dengke.du@windriver.com>
  3. Date: Wed, 14 Dec 2016 18:13:08 +0800
  4. Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross
  5. compiling
  6. In configure.in, it contains the following:
  7. APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
  8. the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4,
  9. it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross
  10. compiling enable.
  11. So it was hardcoded for cross compiling, we should detect it dynamic based on
  12. the sysroot's glibc. We change it to the following:
  13. AC_CHECK_SIZEOF(off_t)
  14. The same for the following hardcoded types for cross compiling:
  15. pid_t 8
  16. ssize_t 8
  17. size_t 8
  18. off_t 8
  19. Change the above correspondingly.
  20. Signed-off-by: Dengke Du <dengke.du@windriver.com>
  21. Upstream-Status: Pending
  22. ---
  23. configure.in | 8 ++++----
  24. 1 file changed, 4 insertions(+), 4 deletions(-)
  25. diff --git a/configure.in b/configure.in
  26. index 3b10422..a227e72 100644
  27. --- a/configure.in
  28. +++ b/configure.in
  29. @@ -1771,7 +1771,7 @@ else
  30. socklen_t_value="int"
  31. fi
  32. -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
  33. +AC_CHECK_SIZEOF(pid_t)
  34. if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
  35. pid_t_fmt='#define APR_PID_T_FMT "hd"'
  36. @@ -1840,7 +1840,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
  37. APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
  38. APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
  39. -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
  40. +AC_CHECK_SIZEOF(ssize_t)
  41. AC_MSG_CHECKING([which format to use for apr_ssize_t])
  42. if test -n "$ssize_t_fmt"; then
  43. @@ -1857,7 +1857,7 @@ fi
  44. ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
  45. -APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
  46. +AC_CHECK_SIZEOF(size_t)
  47. AC_MSG_CHECKING([which format to use for apr_size_t])
  48. if test -n "$size_t_fmt"; then
  49. @@ -1874,7 +1874,7 @@ fi
  50. size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
  51. -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
  52. +AC_CHECK_SIZEOF(off_t)
  53. if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
  54. # Enable LFS
  55. --
  56. 1.8.3.1