diff options
author | Rosen Penev <rosenp@gmail.com> | 2020-03-19 18:31:17 -0700 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-22 19:04:02 +0200 |
commit | aaec2ad13b18086e2aaf9ca9152827c50e578bc0 (patch) | |
tree | e18a2b2eac49f25fcf7a11298db42eafee0f17d7 /toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch | |
parent | da5bb885e17cf77caea70adcf473f1fb95448553 (diff) | |
download | upstream-aaec2ad13b18086e2aaf9ca9152827c50e578bc0.tar.gz upstream-aaec2ad13b18086e2aaf9ca9152827c50e578bc0.tar.bz2 upstream-aaec2ad13b18086e2aaf9ca9152827c50e578bc0.zip |
toolchain/musl: update to 1.2.2
This release introduces 64-bit time_t, which is needed to avoid the
year 2038 problem.
Remove upstream patches. Refreshed others.
Rebased features.h file based on latest musl.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch')
-rw-r--r-- | toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch index 81c96ad76c..2a7436cf84 100644 --- a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch +++ b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch @@ -32,9 +32,9 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com> +#define _GNU_SOURCE #include <ftw.h> #include <dirent.h> - #include <sys/stat.h> -@@ -63,8 +64,20 @@ static int do_nftw(char *path, int (*fn) - lev.base = k; + #include <fcntl.h> +@@ -72,8 +73,20 @@ static int do_nftw(char *path, int (*fn) + if (!fd_limit) close(dfd); } - if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) @@ -56,7 +56,7 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com> for (; h; h = h->chain) if (h->dev == st.st_dev && h->ino == st.st_ino) -@@ -88,7 +101,10 @@ static int do_nftw(char *path, int (*fn) +@@ -101,7 +114,10 @@ static int do_nftw(char *path, int (*fn) strcpy(path+j+1, de->d_name); if ((r=do_nftw(path, fn, fd_limit-1, flags, &new))) { closedir(d); @@ -68,7 +68,7 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com> } } closedir(d); -@@ -98,8 +114,16 @@ static int do_nftw(char *path, int (*fn) +@@ -112,8 +128,16 @@ static int do_nftw(char *path, int (*fn) } path[l] = 0; @@ -87,7 +87,7 @@ Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com> return 0; } -@@ -125,4 +149,5 @@ int nftw(const char *path, int (*fn)(con +@@ -139,4 +163,5 @@ int nftw(const char *path, int (*fn)(con return r; } |