logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

erlang-25.1.2-c99.patch (2686B)

    

  1. Bug: https://bugs.gentoo.org/882887
  2. From: https://github.com/erlang/otp/pull/6504
  3. From: Florian Weimer <fweimer@redhat.com>
  4. Date: Thu, 24 Nov 2022 11:57:49 +0100
  5. Subject: [PATCH 1/2] configure.ac: C99 fix for
  6.  ERTS___AFTER_MORECORE_HOOK_CAN_TRACK_MALLOC
  8. #include <unistd.h> for the sbrk function if the header is available.
  9. --- a/erts/configure
  10. +++ b/erts/configure
  11. @@ -20752,6 +20752,9 @@ else $as_nop
  12.  #ifdef HAVE_MALLOC_H
  13.  #  include <malloc.h>
  14.  #endif
  15. +#ifdef HAVE_UNISTD_H
  16. +#  include <unistd.h>
  17. +#endif
  18.  #if defined(HAVE_END_SYMBOL)
  19.  extern char end;
  20.  #elif defined(HAVE__END_SYMBOL)
  21. --- a/erts/configure.ac
  22. +++ b/erts/configure.ac
  23. @@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use],
  24.  #ifdef HAVE_MALLOC_H
  25.  #  include <malloc.h>
  26.  #endif
  27. +#ifdef HAVE_UNISTD_H
  28. +#  include <unistd.h>
  29. +#endif
  30.  #if defined(HAVE_END_SYMBOL)
  31.  extern char end;
  32.  #elif defined(HAVE__END_SYMBOL)
  34. From 7b720d2bb9e742110ff90ec2495747b2c477e2c7 Mon Sep 17 00:00:00 2001
  35. From: Florian Weimer <fweimer@redhat.com>
  36. Date: Thu, 24 Nov 2022 11:59:22 +0100
  37. Subject: [PATCH 2/2] configure.ac: C99 fixes for poll_works check
  39. Include <fcntl.h> if it is available for the open prototype.
  40. Return from main instead of calling exit, so that no function
  41. declaration is needed.
  42. --- a/erts/configure
  43. +++ b/erts/configure
  44. @@ -24663,10 +24663,13 @@ else $as_nop
  45.  /* end confdefs.h.  */
  46.  
  47.  #include <poll.h>
  48. -main()
  49. +#ifdef HAVE_FCNTL_H
  50. +#include <fcntl.h>
  51. +#endif
  52. +int main()
  53.  {
  54.  #ifdef _POLL_EMUL_H_
  55. -  exit(1); /* Implemented using select() -- fail */
  56. +  return 1; /* Implemented using select() -- fail */
  57.  #else
  58.    struct pollfd fds[1];
  59.    int fd;
  60. @@ -24675,9 +24678,9 @@ main()
  61.    fds[0].events = POLLIN;
  62.    fds[0].revents = 0;
  63.    if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) {
  64. -    exit(1);  /* Does not work for devices -- fail */
  65. +    return 1;  /* Does not work for devices -- fail */
  66.    }
  67. -  exit(0);
  68. +  return 0;
  69.  #endif
  70.  }
  71.  
  72. --- a/erts/configure.ac
  73. +++ b/erts/configure.ac
  74. @@ -3036,10 +3036,13 @@ poll_works=no
  75.  
  76.  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  77.  #include <poll.h>
  78. -main()
  79. +#ifdef HAVE_FCNTL_H
  80. +#include <fcntl.h>
  81. +#endif
  82. +int main()
  83.  {
  84.  #ifdef _POLL_EMUL_H_
  85. -  exit(1); /* Implemented using select() -- fail */
  86. +  return 1; /* Implemented using select() -- fail */
  87.  #else
  88.    struct pollfd fds[1];
  89.    int fd;
  90. @@ -3048,9 +3051,9 @@ main()
  91.    fds[0].events = POLLIN;
  92.    fds[0].revents = 0;
  93.    if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) {
  94. -    exit(1);  /* Does not work for devices -- fail */
  95. +    return 1;  /* Does not work for devices -- fail */
  96.    }
  97. -  exit(0);
  98. +  return 0;
  99.  #endif
  100.  }
  101.  ]])],[poll_works=yes],[poll_works=no],[