diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-01-06 10:45:45 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:50 +0000 |
| commit | c17d9a8d7f89b8e855f87d61583075129e4aa72c (patch) | |
| tree | c72ce64b31eeb796d89d85e7cfe0be590a6de2ae /meta | |
| parent | 8d83c6ad78e1f965a55c0d3f430bad2781a3eb33 (diff) | |
| download | openembedded-core-c17d9a8d7f89b8e855f87d61583075129e4aa72c.tar.gz openembedded-core-c17d9a8d7f89b8e855f87d61583075129e4aa72c.tar.bz2 openembedded-core-c17d9a8d7f89b8e855f87d61583075129e4aa72c.zip | |
tar: Fix build for musl based targets
It only considered linux-gnu hosts when cross compiling
here we add linux-musl to the mix as well
Fixes errors e.g.
1.28-r0/tar-1.28/src/tar.c:1351:5: error: 'SAVEDIR_SORT_INODE'
undeclared here (not in a function)
| SAVEDIR_SORT_INODE
| ^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/tar/tar/musl_dirent.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/tar/tar_1.28.bb | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-extended/tar/tar/musl_dirent.patch b/meta/recipes-extended/tar/tar/musl_dirent.patch new file mode 100644 index 0000000000..b0dc16c3dd --- /dev/null +++ b/meta/recipes-extended/tar/tar/musl_dirent.patch @@ -0,0 +1,19 @@ +musl has valid d_ino implementation + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: tar-1.28/m4/d-ino.m4 +=================================================================== +--- tar-1.28.orig/m4/d-ino.m4 ++++ tar-1.28/m4/d-ino.m4 +@@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_ + [gl_cv_struct_dirent_d_ino=no], + [case "$host_os" in + # Guess yes on glibc systems with Linux kernel. +- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; ++ linux*-gnu*|linux*-musl*) ++ gl_cv_struct_dirent_d_ino="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_struct_dirent_d_ino="guessing no" ;; + esac diff --git a/meta/recipes-extended/tar/tar_1.28.bb b/meta/recipes-extended/tar/tar_1.28.bb index 8816000399..518e622065 100644 --- a/meta/recipes-extended/tar/tar_1.28.bb +++ b/meta/recipes-extended/tar/tar_1.28.bb @@ -7,6 +7,12 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI += "file://remove-gets.patch \ + file://musl_dirent.patch \ " SRC_URI[md5sum] = "8f32b2bc1ed7ddf4cf4e4a39711341b0" SRC_URI[sha256sum] = "60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562" + +do_install_append_libc-musl() { + rm -f ${D}${libdir}/charset.alias + rmdir ${D}${libdir} +} |