/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch

https://gitlab.com/actawithamana/poky · Patch · 50 lines · 43 code · 7 blank · 0 comment · 0 complexity · 97cf85a4426c6b6149d766dc77b8a0ca MD5 · raw file 

    

  1. From 33b97e089d4a98d3acd20bd78337dd915b989bc2 Mon Sep 17 00:00:00 2001
    2. 

  2. From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
    3. 

  3. Date: Fri, 5 Aug 2016 15:24:27 -0500
    4. 

  4. Subject: [PATCH] apt 1.2.12: Fix musl build
    5. 

  5. MIME-Version: 1.0
    6. 

  6. Content-Type: text/plain; charset=UTF-8
    7. 

  7. Content-Transfer-Encoding: 8bit
    8. 

  8. 

  9. methods/connect.cc: Musl doesn't support AI_IDN flag in netdb.h
    10. 

  10. header so define it manually.
    11. 

  11. apt-pkg/contrib/srvrec.h: Add explicity include of sys/types.h
    12. 

  12. to avoid errors in types u_int_SIZE.
    13. 

  13. 

  14. Upstream-status: Pending
    15. 

  15. 

  16. Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
    17. 

  17. ---
    18. 

  18.  apt-pkg/contrib/srvrec.h | 1 +
    19. 

  19.  methods/connect.cc       | 3 +++
    20. 

  20.  2 files changed, 4 insertions(+)
    21. 

  21. 

  22. diff --git a/apt-pkg/contrib/srvrec.h b/apt-pkg/contrib/srvrec.h
    23. 

  23. index 01b8102..15b6875 100644
    24. 

  24. --- a/apt-pkg/contrib/srvrec.h
    25. 

  25. +++ b/apt-pkg/contrib/srvrec.h
    26. 

  26. @@ -9,6 +9,7 @@
    27. 

  27.  #ifndef SRVREC_H
    28. 

  28.  #define SRVREC_H
    29. 

  29.  
    30. 

  30. +#include <sys/types.h>
    31. 

  31.  #include <arpa/nameser.h>
    32. 

  32.  #include <vector>
    33. 

  33.  #include <string>
    34. 

  34. diff --git a/methods/connect.cc b/methods/connect.cc
    35. 

  35. index 07a730b..bb0ab5a 100644
    36. 

  36. --- a/methods/connect.cc
    37. 

  37. +++ b/methods/connect.cc
    38. 

  38. @@ -33,6 +33,9 @@
    39. 

  39.  #include <sys/socket.h>
    40. 

  40.  #include <arpa/inet.h>
    41. 

  41.  #include <netdb.h>
    42. 

  42. +#ifndef AI_IDN
    43. 

  43. +#define AI_IDN 0x0040
    44. 

  44. +#endif
    45. 

  45.  
    46. 

  46.  #include "connect.h"
    47. 

  47.  #include "rfc2553emu.h"
    48. 

  48. -- 
    49. 

  49. 2.1.4
    50.