revert the libiconv stuff. fix bug #4387
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32873 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -8,7 +8,6 @@ SubDirCcFlags -DHAVE_CONFIG_H ;
|
||||
|
||||
SubDirSysHdrs $(SUBDIR) ;
|
||||
#SubDirSysHdrs $(SUBDIR) $(DOTDOT) ;
|
||||
UseLibraryHeaders iconv ;
|
||||
|
||||
StaticLibrary libfetish.a :
|
||||
# __fpending.c
|
||||
@@ -180,7 +179,6 @@ StaticLibrary libfetish.a :
|
||||
# strcspn.c
|
||||
# strdup.c
|
||||
strftime.c
|
||||
striconv.c
|
||||
strintcmp.c
|
||||
stripslash.c
|
||||
strnlen1.c
|
||||
@@ -225,7 +223,6 @@ StaticLibrary libfetish.a :
|
||||
xmemxfrm.c
|
||||
xnanosleep.c
|
||||
xprintf.c
|
||||
xstriconv.c
|
||||
xstrndup.c
|
||||
xstrtod.c
|
||||
xstrtoimax.c
|
||||
|
||||
@@ -832,10 +832,10 @@
|
||||
/* #undef HAVE_HURD_H */
|
||||
|
||||
/* Define if you have the iconv() function and it works. */
|
||||
#define HAVE_ICONV 1
|
||||
/* #undef HAVE_ICONV */
|
||||
|
||||
/* Define to 1 if you have the <iconv.h> header file. */
|
||||
#define HAVE_ICONV_H 1
|
||||
/* #undef HAVE_ICONV_H */
|
||||
|
||||
/* Define to 1 if you have the `inet_ntop' function. */
|
||||
/* #undef HAVE_INET_NTOP */
|
||||
|
||||
@@ -74,7 +74,7 @@ StdBinCommands
|
||||
wc.c
|
||||
whoami.c
|
||||
yes.c
|
||||
: libfetish.a libiconv.a : $(coreutils_rsrc) ;
|
||||
: libfetish.a : $(coreutils_rsrc) ;
|
||||
|
||||
# set set-uid bit on su
|
||||
MODE on su = 04755 ;
|
||||
@@ -96,7 +96,7 @@ StdBinCommands
|
||||
pwd.c
|
||||
sleep.c
|
||||
sort.c
|
||||
: libfetish.a libiconv.a libroot.so : $(coreutils_rsrc) ;
|
||||
: libfetish.a libroot.so : $(coreutils_rsrc) ;
|
||||
|
||||
# df.c
|
||||
# hostid.c
|
||||
@@ -126,7 +126,7 @@ BinCommand chown :
|
||||
: libfetish.a libroot.so : $(coreutils_rsrc) ;
|
||||
|
||||
BinCommand cp :
|
||||
cp.c copy.c cp-hash.c : libfetish.a libiconv.a : $(coreutils_rsrc) ;
|
||||
cp.c copy.c cp-hash.c : libfetish.a : $(coreutils_rsrc) ;
|
||||
|
||||
BinCommand mv :
|
||||
mv.c [ FGristFiles copy.o cp-hash.o remove.o ]
|
||||
@@ -154,4 +154,4 @@ BinCommand rmdir : rmdir.c [ FGristFiles prog-fprintf.o ] : libfetish.a libroot.
|
||||
|
||||
BinCommand uname : uname.c uname-uname.c : libfetish.a $(TARGET_SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ;
|
||||
|
||||
BinCommand timeout : timeout.c [ FGristFiles operand2sig.o ] : libfetish.a libiconv.a : $(coreutils_rsrc) ;
|
||||
BinCommand timeout : timeout.c [ FGristFiles operand2sig.o ] : libfetish.a : $(coreutils_rsrc) ;
|
||||
|
||||
Reference in New Issue
Block a user