summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-02 21:41:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:28 +0000
commitabdfacb997dd26c7bd0877738db72c695ec785bc (patch)
tree703fea20e1f99d73e1e8289a3255dd81588d430e /meta
parentec187d35f4a3ff85bdc47e76b33f43a56ac19aaa (diff)
downloadpoky-abdfacb997dd26c7bd0877738db72c695ec785bc.tar.gz
apt: Add support for building for musl targets
Turn bzip2 support into a PACKAGECONFIG zlibs is a must have and therefore add it to DEPENDS will make the build consistent (From OE-Core rev: ded03dab901647a7388d219a3a228d4f4f4298e8) Signed-off-by: Khem Raj <raj.khem@gmail.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-environment.mak-musl-based-systems-can-generate-shar.patch29
-rw-r--r--meta/recipes-devtools/apt/apt_1.0.10.1.bb3
3 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 312c6a9037..78ef5a7e1e 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -11,6 +11,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20150805T094928Z/pool/main/
11 file://nodoc.patch \ 11 file://nodoc.patch \
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 " 15 "
15SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276" 16SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276"
16SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543" 17SRC_URI[sha256sum] = "3fb1de9598363c416591d49e3c285458e095b035e6c06d5b944a54e15fc9b543"
diff --git a/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch b/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch
new file mode 100644
index 0000000000..042372b515
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch
@@ -0,0 +1,29 @@
1From 2f8aa21ace375c18977ed908b291c80a210a93c6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 08:06:12 +0000
4Subject: [PATCH] environment.mak: musl based systems can generate shared
5 objects too
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9Upstream-Status: Pending
10
11 buildlib/environment.mak.in | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
15index b0a8d9d..3a52344 100644
16--- a/buildlib/environment.mak.in
17+++ b/buildlib/environment.mak.in
18@@ -68,7 +68,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
19
20 # Shared library things
21 HOST_OS = @host_os@
22-ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)
23+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu linux-musl%,$(HOST_OS))),0)
24 SONAME_MAGIC=-Wl,-soname -Wl,
25 LFLAGS_SO=
26 else
27--
282.6.4
29
diff --git a/meta/recipes-devtools/apt/apt_1.0.10.1.bb b/meta/recipes-devtools/apt/apt_1.0.10.1.bb
index bf77e2a301..85c0d56159 100644
--- a/meta/recipes-devtools/apt/apt_1.0.10.1.bb
+++ b/meta/recipes-devtools/apt/apt_1.0.10.1.bb
@@ -1,4 +1,4 @@
1DEPENDS = "curl db" 1DEPENDS = "curl db zlib"
2RDEPENDS_${PN} = "dpkg bash debianutils" 2RDEPENDS_${PN} = "dpkg bash debianutils"
3require apt.inc 3require apt.inc
4 4
@@ -6,6 +6,7 @@ require apt-package.inc
6 6
7PACKAGECONFIG ??= "lzma" 7PACKAGECONFIG ??= "lzma"
8PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz" 8PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz"
9PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,bzip2"
9 10
10FILES_${PN} += "${bindir}/apt-key" 11FILES_${PN} += "${bindir}/apt-key"
11apt-manpages += "doc/apt-key.8" 12apt-manpages += "doc/apt-key.8"