diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-18 19:03:02 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-18 19:03:02 +0000 |
| commit | 9e03b1c62a435c9bcbcc3ff76d652fe963a306a0 (patch) | |
| tree | a7ce5ac75234e84c8fe06a64ee53e023d02f55c6 /sys-apps/findutils/files | |
| parent | remove 2.1_pre8 (diff) | |
| download | gentoo-2-9e03b1c62a435c9bcbcc3ff76d652fe963a306a0.tar.gz gentoo-2-9e03b1c62a435c9bcbcc3ff76d652fe963a306a0.tar.bz2 gentoo-2-9e03b1c62a435c9bcbcc3ff76d652fe963a306a0.zip | |
Add workaround for the glibc 'fix' that breaks Gentoo/FreeBSD, keyword also 4.3 version. Add workaround for NetBSD systems. Bug #123253.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'sys-apps/findutils/files')
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.3.0-nbsd.patch | 21 | ||||
| -rw-r--r-- | sys-apps/findutils/files/gnulib-openat-mode_t.patch | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/sys-apps/findutils/files/findutils-4.3.0-nbsd.patch b/sys-apps/findutils/files/findutils-4.3.0-nbsd.patch new file mode 100644 index 000000000000..58f5b1b01660 --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.3.0-nbsd.patch @@ -0,0 +1,21 @@ +--- findutils-4.3.0.orig/gnulib/lib/mountlist.c 2005-12-12 06:23:41.000000000 -0200 ++++ findutils-4.3.0/gnulib/lib/mountlist.c 2006-02-18 07:26:20.000000000 -0200 +@@ -257,6 +257,7 @@ + # endif /* ! HAVE_F_FSTYPENAME_IN_STATFS */ + + /* __NetBSD__ || BSD_NET2 || __OpenBSD__ */ ++#define statfs statvfs + static char * + fsp_to_string (const struct statfs *fsp) + { +--- findutils-4.3.0.orig/gnulib/m4/fstypename.m4 2005-12-12 06:23:42.000000000 -0200 ++++ findutils-4.3.0/gnulib/m4/fstypename.m4 2006-02-18 07:07:28.000000000 -0200 +@@ -22,7 +22,7 @@ + #include <sys/types.h> + #include <sys/mount.h> + ], +- [struct statfs s; int i = sizeof s.f_fstypename;], ++ [struct statvfs s; int i = sizeof s.f_fstypename;], + fu_cv_sys_f_fstypename_in_statfs=yes, + fu_cv_sys_f_fstypename_in_statfs=no + ) diff --git a/sys-apps/findutils/files/gnulib-openat-mode_t.patch b/sys-apps/findutils/files/gnulib-openat-mode_t.patch new file mode 100644 index 000000000000..acd285f0ce22 --- /dev/null +++ b/sys-apps/findutils/files/gnulib-openat-mode_t.patch @@ -0,0 +1,21 @@ +Index: sources/gnulib/lib/openat.c +=================================================================== +--- sources.orig/gnulib/lib/openat.c ++++ sources/gnulib/lib/openat.c +@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename + va_list arg; + va_start (arg, flags); + +- /* Assume that mode_t is passed compatibly with mode_t's type +- after argument promotion. */ +- mode = va_arg (arg, mode_t); ++ /* If mode_t is narrower than int, use the promoted type (int), ++ not mode_t. Use sizeof to guess whether mode_t is nerrower; ++ we don't know of any practical counterexamples. */ ++ if (sizeof (mode_t) < sizeof (int)) ++ mode = va_arg (arg, int); ++ else ++ mode = va_arg (arg, mode_t); + + va_end (arg); + } |