diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-01-02 21:41:17 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:48 +0000 |
| commit | ded03dab901647a7388d219a3a228d4f4f4298e8 (patch) | |
| tree | a4ad73d39593dd1a8e28baa75f8ddd5232c5f071 /meta | |
| parent | dda96dbb3e4cd83fe6b8fd8370c8ca2a737cc078 (diff) | |
| download | openembedded-core-contrib-ded03dab901647a7388d219a3a228d4f4f4298e8.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta')
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/ file://nodoc.patch \ file://disable-configure-in-makefile.patch \ file://disable-test.patch \ + file://0001-environment.mak-musl-based-systems-can-generate-shar.patch \ " SRC_URI[md5sum] = "6505c4297b338adb2087ce87bbc4a276" SRC_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 @@ +From 2f8aa21ace375c18977ed908b291c80a210a93c6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 31 Dec 2015 08:06:12 +0000 +Subject: [PATCH] environment.mak: musl based systems can generate shared + objects too + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + buildlib/environment.mak.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in +index b0a8d9d..3a52344 100644 +--- a/buildlib/environment.mak.in ++++ b/buildlib/environment.mak.in +@@ -68,7 +68,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu linux-musl%,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else +-- +2.6.4 + 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 @@ -DEPENDS = "curl db" +DEPENDS = "curl db zlib" RDEPENDS_${PN} = "dpkg bash debianutils" require apt.inc @@ -6,6 +6,7 @@ require apt-package.inc PACKAGECONFIG ??= "lzma" PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz" +PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,bzip2" FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" |