| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From 33b97e089d4a98d3acd20bd78337dd915b989bc2 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> |
| 3 | Date: Fri, 5 Aug 2016 15:24:27 -0500 |
| 4 | Subject: [PATCH] apt 1.2.12: Fix musl build |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | methods/connect.cc: Musl doesn't support AI_IDN flag in netdb.h |
| 10 | header so define it manually. |
| 11 | apt-pkg/contrib/srvrec.h: Add explicity include of sys/types.h |
| 12 | to avoid errors in types u_int_SIZE. |
| 13 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | Upstream-Status: Pending |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 15 | |
| 16 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> |
| 17 | --- |
| 18 | apt-pkg/contrib/srvrec.h | 1 + |
| 19 | methods/connect.cc | 3 +++ |
| 20 | 2 files changed, 4 insertions(+) |
| 21 | |
| 22 | diff --git a/apt-pkg/contrib/srvrec.h b/apt-pkg/contrib/srvrec.h |
| 23 | index 01b8102..15b6875 100644 |
| 24 | --- a/apt-pkg/contrib/srvrec.h |
| 25 | +++ b/apt-pkg/contrib/srvrec.h |
| 26 | @@ -9,6 +9,7 @@ |
| 27 | #ifndef SRVREC_H |
| 28 | #define SRVREC_H |
| 29 | |
| 30 | +#include <sys/types.h> |
| 31 | #include <arpa/nameser.h> |
| 32 | #include <vector> |
| 33 | #include <string> |
| 34 | diff --git a/methods/connect.cc b/methods/connect.cc |
| 35 | index 07a730b..bb0ab5a 100644 |
| 36 | --- a/methods/connect.cc |
| 37 | +++ b/methods/connect.cc |
| 38 | @@ -33,6 +33,9 @@ |
| 39 | #include <sys/socket.h> |
| 40 | #include <arpa/inet.h> |
| 41 | #include <netdb.h> |
| 42 | +#ifndef AI_IDN |
| 43 | +#define AI_IDN 0x0040 |
| 44 | +#endif |
| 45 | |
| 46 | #include "connect.h" |
| 47 | #include "rfc2553emu.h" |
| 48 | -- |
| 49 | 2.1.4 |
| 50 | |