i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert the libiconv stuff. fix bug #4387

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32873 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2009-08-31 20:09:14 +00:00
parent d478944d26
commit 7703280cb0
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/coreutils/lib/Jamfile
-3
View File
@@ -8,7 +8,6 @@ SubDirCcFlags -DHAVE_CONFIG_H ;
SubDirSysHdrs $(SUBDIR) ; SubDirSysHdrs $(SUBDIR) ;
#SubDirSysHdrs $(SUBDIR) $(DOTDOT) ; #SubDirSysHdrs $(SUBDIR) $(DOTDOT) ;
UseLibraryHeaders iconv ;
StaticLibrary libfetish.a : StaticLibrary libfetish.a :
# __fpending.c # __fpending.c
@@ -180,7 +179,6 @@ StaticLibrary libfetish.a :
# strcspn.c # strcspn.c
# strdup.c # strdup.c
strftime.c strftime.c
striconv.c
strintcmp.c strintcmp.c
stripslash.c stripslash.c
strnlen1.c strnlen1.c
@@ -225,7 +223,6 @@ StaticLibrary libfetish.a :
xmemxfrm.c xmemxfrm.c
xnanosleep.c xnanosleep.c
xprintf.c xprintf.c
xstriconv.c
xstrndup.c xstrndup.c
xstrtod.c xstrtod.c
xstrtoimax.c xstrtoimax.c
src/bin/coreutils/lib/config.h
+2 -2
View File
@@ -832,10 +832,10 @@
/* #undef HAVE_HURD_H */ /* #undef HAVE_HURD_H */
/* Define if you have the iconv() function and it works. */ /* 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 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. */ /* Define to 1 if you have the `inet_ntop' function. */
/* #undef HAVE_INET_NTOP */ /* #undef HAVE_INET_NTOP */
src/bin/coreutils/src/Jamfile
+4 -4
View File
@@ -74,7 +74,7 @@ StdBinCommands
wc.c wc.c
whoami.c whoami.c
yes.c yes.c
: libfetish.a libiconv.a : $(coreutils_rsrc) ; : libfetish.a : $(coreutils_rsrc) ;
# set set-uid bit on su # set set-uid bit on su
MODE on su = 04755 ; MODE on su = 04755 ;
@@ -96,7 +96,7 @@ StdBinCommands
pwd.c pwd.c
sleep.c sleep.c
sort.c sort.c
: libfetish.a libiconv.a libroot.so : $(coreutils_rsrc) ; : libfetish.a libroot.so : $(coreutils_rsrc) ;
# df.c # df.c
# hostid.c # hostid.c
@@ -126,7 +126,7 @@ BinCommand chown :
: libfetish.a libroot.so : $(coreutils_rsrc) ; : libfetish.a libroot.so : $(coreutils_rsrc) ;
BinCommand cp : 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 : BinCommand mv :
mv.c [ FGristFiles copy.o cp-hash.o remove.o ] 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 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) ;