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

* switched back libiconv to a static library and remove all references to

Browse Source 
it (headers and library) from the image. The libiconv in our tree is 
  only used internally as a backend for libtextencoding. The real libiconv
  is provided as an optional package.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31452 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-07-08 01:00:22 +00:00
parent 2180971924
commit f612278f55
5 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -1
View File
@@ -83,7 +83,7 @@ SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so
libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
libilmimf.so libiconv.so liblocale.so $(HAIKU_SHARED_LIBSUPC++) libilmimf.so $(HAIKU_SHARED_LIBSUPC++)
; ;
SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
net_server media_addon_server input_server app_server fake_app_server net_server media_addon_server input_server app_server fake_app_server
build/jam/OptionalPackages
-1
View File
@@ -356,7 +356,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
# third party libs headers # third party libs headers
AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ; AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs iconv : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs png : 3rdparty ; AddHeaderDirectoryToHaikuImage libs png : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ; AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ;
headers/posix/iconv.h
-24
View File
@@ -1,24 +0,0 @@
#ifndef _ICONV_H_
#define _ICONV_H_
/*
** Distributed under the terms of the OpenBeOS License.
*/
#include <size_t.h>
typedef void *iconv_t;
#ifdef __cplusplus
extern "C" {
#endif
extern iconv_t iconv_open(const char *toCode, const char *fromCode);
extern int iconv_close(iconv_t cd);
extern size_t iconv(iconv_t cd, char **inBuffer, size_t *inBytesLeft,
char **outBuffer, size_t *outBytesLeft);
#ifdef __cplusplus
}
#endif
#endif /* _ICONV_H_ */
src/kits/textencoding/Jamfile
+1 -1
View File
@@ -11,7 +11,7 @@ SharedLibrary libtextencoding.so :
CharacterSetRoster.cpp CharacterSetRoster.cpp
character_sets.cpp character_sets.cpp
utf8_conversions.cpp utf8_conversions.cpp
: be libiconv.so $(TARGET_LIBSUPC++) ; : be libiconv.a $(TARGET_LIBSUPC++) ;
Package haiku-maildaemon-cvs : Package haiku-maildaemon-cvs :
libtextencoding.so : libtextencoding.so :
src/libs/iconv/Jamfile
+1 -1
View File
@@ -14,7 +14,7 @@ SubDirCcFlags
-DICONV_CONST="" -DICONV_CONST=""
; ;
SharedLibrary libiconv.so : StaticLibrary libiconv.a :
iconv.c iconv.c
localcharset.c localcharset.c
; ;