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-24 09:40:29 +0000 |
commit | 1076499cdf6bd4e77b2fd8333c6a92b41545663e (patch) | |
tree | 6d66643f1e82e9084b8abef99e300708873adf2e /meta/recipes-extended | |
parent | e4510237edaaf27cd7c85ac206cebb670a18ac1e (diff) | |
download | poky-1076499cdf6bd4e77b2fd8333c6a92b41545663e.tar.gz |
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
| ^
(From OE-Core rev: c17d9a8d7f89b8e855f87d61583075129e4aa72c)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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 @@ | |||
1 | musl has valid d_ino implementation | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Index: tar-1.28/m4/d-ino.m4 | ||
7 | =================================================================== | ||
8 | --- tar-1.28.orig/m4/d-ino.m4 | ||
9 | +++ tar-1.28/m4/d-ino.m4 | ||
10 | @@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_ | ||
11 | [gl_cv_struct_dirent_d_ino=no], | ||
12 | [case "$host_os" in | ||
13 | # Guess yes on glibc systems with Linux kernel. | ||
14 | - linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; | ||
15 | + linux*-gnu*|linux*-musl*) | ||
16 | + gl_cv_struct_dirent_d_ino="guessing yes" ;; | ||
17 | # If we don't know, assume the worst. | ||
18 | *) gl_cv_struct_dirent_d_ino="guessing no" ;; | ||
19 | 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" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
8 | 8 | ||
9 | SRC_URI += "file://remove-gets.patch \ | 9 | SRC_URI += "file://remove-gets.patch \ |
10 | file://musl_dirent.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[md5sum] = "8f32b2bc1ed7ddf4cf4e4a39711341b0" | 12 | SRC_URI[md5sum] = "8f32b2bc1ed7ddf4cf4e4a39711341b0" |
12 | SRC_URI[sha256sum] = "60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562" | 13 | SRC_URI[sha256sum] = "60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562" |
14 | |||
15 | do_install_append_libc-musl() { | ||
16 | rm -f ${D}${libdir}/charset.alias | ||
17 | rmdir ${D}${libdir} | ||
18 | } | ||