summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-08-05 16:42:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:28 +0100
commit26c6b10da83dcb7a1bcacabcf32e4ee2fab84057 (patch)
treec9db130545dc0d65ef59dec7ac05476de2eff92d /meta
parente884ceeaa352c4ae2746691c7dc876587421a4fb (diff)
downloadpoky-26c6b10da83dcb7a1bcacabcf32e4ee2fab84057.tar.gz
apt: Fix build in musl it was break due to upgrade to 1.2.12
methods/connect.cc: Musl doesn't support AI_IDN flag in netdb.h header so define it manually. apt-pkg/contrib/srvrec.h: Add explicity include of sys/types.h to avoid errors in types u_int_SIZE. (From OE-Core rev: a088018e6e36073c0723b160f8b087a5243836ee) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/apt/apt.inc1
-rw-r--r--meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch50
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 87cc20693e..3026370844 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -12,6 +12,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160526T162943Z/pool/main/
12 file://disable-configure-in-makefile.patch \ 12 file://disable-configure-in-makefile.patch \
13 file://disable-test.patch \ 13 file://disable-test.patch \
14 file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \ 14 file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \
15 file://0001-apt-1.2.12-Fix-musl-build.patch \
15 " 16 "
16SRC_URI[md5sum] = "80f6f0ef110a45a7e5af8a9d233fb0e7" 17SRC_URI[md5sum] = "80f6f0ef110a45a7e5af8a9d233fb0e7"
17SRC_URI[sha256sum] = "e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6" 18SRC_URI[sha256sum] = "e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6"
diff --git a/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch b/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch
new file mode 100644
index 0000000000..04b0406583
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch
@@ -0,0 +1,50 @@
1From 33b97e089d4a98d3acd20bd78337dd915b989bc2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Fri, 5 Aug 2016 15:24:27 -0500
4Subject: [PATCH] apt 1.2.12: Fix musl build
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9methods/connect.cc: Musl doesn't support AI_IDN flag in netdb.h
10header so define it manually.
11apt-pkg/contrib/srvrec.h: Add explicity include of sys/types.h
12to avoid errors in types u_int_SIZE.
13
14Upstream-status: Pending
15
16Signed-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
22diff --git a/apt-pkg/contrib/srvrec.h b/apt-pkg/contrib/srvrec.h
23index 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>
34diff --git a/methods/connect.cc b/methods/connect.cc
35index 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--
492.1.4
50