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>
This commit is contained in:
Aníbal Limón 2016-08-05 16:42:48 -05:00 committed by Richard Purdie
parent e884ceeaa3
commit 26c6b10da8
2 changed files with 51 additions and 0 deletions

View File

@ -12,6 +12,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160526T162943Z/pool/main/
file://disable-configure-in-makefile.patch \
file://disable-test.patch \
file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \
file://0001-apt-1.2.12-Fix-musl-build.patch \
"
SRC_URI[md5sum] = "80f6f0ef110a45a7e5af8a9d233fb0e7"
SRC_URI[sha256sum] = "e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6"

View File

@ -0,0 +1,50 @@
From 33b97e089d4a98d3acd20bd78337dd915b989bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
Date: Fri, 5 Aug 2016 15:24:27 -0500
Subject: [PATCH] apt 1.2.12: Fix musl build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
Upstream-status: Pending
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
apt-pkg/contrib/srvrec.h | 1 +
methods/connect.cc | 3 +++
2 files changed, 4 insertions(+)
diff --git a/apt-pkg/contrib/srvrec.h b/apt-pkg/contrib/srvrec.h
index 01b8102..15b6875 100644
--- a/apt-pkg/contrib/srvrec.h
+++ b/apt-pkg/contrib/srvrec.h
@@ -9,6 +9,7 @@
#ifndef SRVREC_H
#define SRVREC_H
+#include <sys/types.h>
#include <arpa/nameser.h>
#include <vector>
#include <string>
diff --git a/methods/connect.cc b/methods/connect.cc
index 07a730b..bb0ab5a 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -33,6 +33,9 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netdb.h>
+#ifndef AI_IDN
+#define AI_IDN 0x0040
+#endif
#include "connect.h"
#include "rfc2553emu.h"
--
2.1.4