On 16-08-05 16:42:48, Aníbal Limón wrote: > 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. >
This patch fixes the musl build issue. > Signed-off-by: Aníbal Limón <[email protected]> > --- > meta/recipes-devtools/apt/apt.inc | 1 + > .../apt/apt/0001-apt-1.2.12-Fix-musl-build.patch | 50 > ++++++++++++++++++++++ > 2 files changed, 51 insertions(+) > create mode 100644 > meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch > > diff --git a/meta/recipes-devtools/apt/apt.inc > b/meta/recipes-devtools/apt/apt.inc > index 87cc206..3026370 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/ > 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" > 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 0000000..04b0406 > --- /dev/null > +++ b/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch > @@ -0,0 +1,50 @@ > +From 33b97e089d4a98d3acd20bd78337dd915b989bc2 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]> > +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 <[email protected]> > +--- > + 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 > + > -- > 2.1.4 > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
