From 3a2b5bfc6d0fd1781d2191cc9f51f18a563eb72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 4 Apr 2005 19:33:37 +0000 Subject: [PATCH] * don't rely on fchdir-stub.c anymore to provide fchdir as we support it * #undef DEBUG in plib/physmem.c to avoid debug code * comment out #define mktime rpl_mktime, don't know why it wasn't detected * now links mv, chown, chgrp, rm, chmod, du, mkdir, pwd against libroot.so for fchdir git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12238 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/coreutils/config.h | 2 +- src/bin/coreutils/lib/Jamfile | 2 +- src/bin/coreutils/lib/physmem.c | 1 + src/bin/coreutils/src/Jamfile | 18 +++++++++--------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/bin/coreutils/config.h b/src/bin/coreutils/config.h index 8f88f8d7b1..6a03dfb06e 100644 --- a/src/bin/coreutils/config.h +++ b/src/bin/coreutils/config.h @@ -1582,7 +1582,7 @@ /* #undef mkstemp */ /* Define to rpl_mktime if the replacement function should be used. */ -#define mktime rpl_mktime +//#define mktime rpl_mktime /* Define to `int' if does not define. */ /* #undef mode_t */ diff --git a/src/bin/coreutils/lib/Jamfile b/src/bin/coreutils/lib/Jamfile index f62f90b3ea..56b3293e63 100644 --- a/src/bin/coreutils/lib/Jamfile +++ b/src/bin/coreutils/lib/Jamfile @@ -31,7 +31,7 @@ StaticLibrary fetish : euidaccess.c exclude.c exitfail.c - fchdir-stub.c +# fchdir-stub.c # fchown-stub.c file-type.c # fileblocks.c diff --git a/src/bin/coreutils/lib/physmem.c b/src/bin/coreutils/lib/physmem.c index dc67b575cf..45091604e6 100644 --- a/src/bin/coreutils/lib/physmem.c +++ b/src/bin/coreutils/lib/physmem.c @@ -16,6 +16,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Written by Paul Eggert. */ +#undef DEBUG #if HAVE_CONFIG_H # include diff --git a/src/bin/coreutils/src/Jamfile b/src/bin/coreutils/src/Jamfile index 67f93b9ff6..33b846b042 100644 --- a/src/bin/coreutils/src/Jamfile +++ b/src/bin/coreutils/src/Jamfile @@ -11,7 +11,6 @@ ResComp $(coreutils_rsrc) : [ FGristFiles coreutils.rdef ] ; StdBinCommands basename.c cat.c - chmod.c cksum.c comm.c csplit.c @@ -20,7 +19,6 @@ StdBinCommands dd.c dircolors.c dirname.c - du.c echo.c env.c expand.c @@ -36,7 +34,6 @@ StdBinCommands link.c ln.c logname.c - mkdir.c mkfifo.c mknod.c nl.c @@ -48,7 +45,6 @@ StdBinCommands printenv.c printf.c ptx.c - pwd.c readlink.c rmdir.c seq.c @@ -82,9 +78,13 @@ StdBinCommands uname.c : libfetish.a $(SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ; -#commands requiring something in libroot.so (getrlimit...) +#commands requiring something in libroot.so (getrlimit, fchdir...) StdBinCommands + chmod.c + du.c + mkdir.c + pwd.c sleep.c sort.c : libfetish.a libroot.so : $(coreutils_rsrc) ; @@ -104,13 +104,13 @@ BinCommand ls : ls.c ls-dir.c : libfetish.a : $(coreutils_rsrc) ; BinCommand rm : - rm.c remove.c : libfetish.a : $(coreutils_rsrc) ; + rm.c remove.c : libfetish.a libroot.so : $(coreutils_rsrc) ; BinCommand chgrp : - chgrp.c chown-core.c : libfetish.a : $(coreutils_rsrc) ; + chgrp.c chown-core.c : libfetish.a libroot.so : $(coreutils_rsrc) ; BinCommand chown : - chown.c chown-core.c : libfetish.a : $(coreutils_rsrc) ; + chown.c chown-core.c : libfetish.a libroot.so : $(coreutils_rsrc) ; BinCommand cp : cp.c copy.c cp-hash.c : libfetish.a : $(coreutils_rsrc) ; @@ -119,7 +119,7 @@ BinCommand md5sum : md5sum.c md5.c : libfetish.a : $(coreutils_rsrc) ; BinCommand mv : - mv.c copy.c cp-hash.c remove.c : libfetish.a : $(coreutils_rsrc) ; + mv.c copy.c cp-hash.c remove.c : libfetish.a libroot.so : $(coreutils_rsrc) ; BinCommand sha1sum : md5sum.c sha1sum.c : libfetish.a : $(coreutils_rsrc) ;