Patchwork [v2] Give coreutils a chance to build the df utility

login
register
mail settings
Submitter Julian Pidancet
Date Oct. 26, 2011, 9:41 p.m.
Message ID <326c1a05ec310abcb0ec8363bcbe952c05fdf9fb.1319665176.git.julian.pidancet@gmail.com>
Download mbox | patch
Permalink /patch/13875/
State Accepted
Commit fa1eb21933a880aa20e4ca87574753b1ec272c3b
Headers show

Comments

Julian Pidancet - Oct. 26, 2011, 9:41 p.m.
The coreutils configure script is unable determine how to get free
space from the Operating System when cross-compiling.
This changes caches the result of the "statfs2_bsize" test for the
coreutils configure script.
Both glibc and uclibc defines statfs as a two-argument function
and uses a struct statfs containing a f_bsize field. That's why
the fu_cv_sys_stat_statfs2_bsize variable has to be defined for
both libcs.

Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
---
 meta/recipes-core/coreutils/coreutils_8.14.bb |    2 +-
 meta/site/common-glibc                        |    3 +++
 meta/site/common-uclibc                       |    3 +++
 3 files changed, 7 insertions(+), 1 deletions(-)
Koen Kooi - Nov. 1, 2011, 2:21 p.m.
Op 26 okt. 2011, om 23:41 heeft Julian Pidancet het volgende geschreven:

> The coreutils configure script is unable determine how to get free
> space from the Operating System when cross-compiling.
> This changes caches the result of the "statfs2_bsize" test for the
> coreutils configure script.
> Both glibc and uclibc defines statfs as a two-argument function
> and uses a struct statfs containing a f_bsize field. That's why
> the fu_cv_sys_stat_statfs2_bsize variable has to be defined for
> both libcs.
> 
> Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
> ---
> meta/recipes-core/coreutils/coreutils_8.14.bb |    2 +-
> meta/site/common-glibc                        |    3 +++
> meta/site/common-uclibc                       |    3 +++
> 3 files changed, 7 insertions(+), 1 deletions(-)


A bit late, but this is missing a PR bump, could you please send a followup patch to fix that?

regards,

Koen
Richard Purdie - Nov. 1, 2011, 3:49 p.m.
On Tue, 2011-11-01 at 15:21 +0100, Koen Kooi wrote:
> Op 26 okt. 2011, om 23:41 heeft Julian Pidancet het volgende geschreven:
> 
> > The coreutils configure script is unable determine how to get free
> > space from the Operating System when cross-compiling.
> > This changes caches the result of the "statfs2_bsize" test for the
> > coreutils configure script.
> > Both glibc and uclibc defines statfs as a two-argument function
> > and uses a struct statfs containing a f_bsize field. That's why
> > the fu_cv_sys_stat_statfs2_bsize variable has to be defined for
> > both libcs.
> > 
> > Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
> > ---
> > meta/recipes-core/coreutils/coreutils_8.14.bb |    2 +-
> > meta/site/common-glibc                        |    3 +++
> > meta/site/common-uclibc                       |    3 +++
> > 3 files changed, 7 insertions(+), 1 deletions(-)
> 
> 
> A bit late, but this is missing a PR bump, could you please send a followup patch to fix that?

I've pushed a PR bump for this myself since it saves me tracking the
issue any further.

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index f3b7af7..fa2a2c9 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -27,7 +27,7 @@  bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirnam
                 join link logname md5sum mkfifo mktemp nice nl nohup nproc od paste pathchk \
                 pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \
                 sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
-                tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
+                tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes df"
 
 # hostname gets a special treatment and is not included in this
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
diff --git a/meta/site/common-glibc b/meta/site/common-glibc
index 9b74038..364ab67 100644
--- a/meta/site/common-glibc
+++ b/meta/site/common-glibc
@@ -25,6 +25,9 @@  clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
+# coreutils
+fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes}
+
 # glib
 glib_cv_strlcpy=${glib_cv_strlcpy=no}
 ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index bdad0e9..a264765 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -28,6 +28,9 @@  ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
 bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no}
 bash_cv_sys_siglist=${bash_cv_sys_siglist=no}
 
+# coreutils
+fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes}
+
 # va_copy and _va_copy
 ac_cv_va_copy=${ac_cv_va_copy=yes}
 ac_cv___va_copy=${ac_cv___va_copy=yes}