diff options
| -rw-r--r-- | meta/recipes-extended/tar/tar/musl_dirent.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/tar/tar_1.33.bb (renamed from meta/recipes-extended/tar/tar_1.32.bb) | 7 |
2 files changed, 2 insertions, 24 deletions
diff --git a/meta/recipes-extended/tar/tar/musl_dirent.patch b/meta/recipes-extended/tar/tar/musl_dirent.patch deleted file mode 100644 index 2d98ed1310..0000000000 --- a/meta/recipes-extended/tar/tar/musl_dirent.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 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 | # Guess no on native Windows. | ||
| 18 | mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; | ||
| 19 | # If we don't know, assume the worst. | ||
diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.33.bb index ebe6cb0dbd..5e34cdf9e5 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.33.bb | |||
| @@ -6,12 +6,9 @@ SECTION = "base" | |||
| 6 | LICENSE = "GPLv3" | 6 | LICENSE = "GPLv3" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 8 | 8 | ||
| 9 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ | 9 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" |
| 10 | file://musl_dirent.patch \ | ||
| 11 | " | ||
| 12 | 10 | ||
| 13 | SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05" | 11 | SRC_URI[sha256sum] = "85b6953f4bc9666eb7db61b48f150dca21b941d85090171ea8c4f89902e460af" |
| 14 | SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566" | ||
| 15 | 12 | ||
| 16 | inherit autotools gettext texinfo | 13 | inherit autotools gettext texinfo |
| 17 | 14 | ||
