Merge liblocale.so into libbe.so.
* Make the locale kit a part of libbe. * Drop the LocaleBackend kludge used from within libbe (and from other places, too) in order to access system catalog strings. This is now done via gSystemCatalog, which is provided and initialized by libbe. * Drop all references to liblocale.so from all Jamfiles. * Add legacy symlink liblocale.so in order to keep optional packages that rely on it in a working state. TODO: the documentation hasn't been updated.
This commit is contained in:
+12
-1
@@ -88,7 +88,6 @@ SYSTEM_LIBS =
|
||||
libdebug.so libdevice.so
|
||||
libgame.so $(X86_ONLY)libGL.so libgnu.so
|
||||
libjpeg.so
|
||||
liblocale.so
|
||||
libmail.so libmedia.so libmidi.so libmidi2.so
|
||||
libnetwork.so
|
||||
libpng.so
|
||||
@@ -312,10 +311,22 @@ if $(TARGET_ARCH) = x86 {
|
||||
}
|
||||
}
|
||||
|
||||
# libbe.so now includes what used to be in liblocale.so
|
||||
# TODO: Remove this once all optional packages have been rebuilt (i.e. after
|
||||
# next release)!
|
||||
SYSTEM_LIBS_LIBBE_ALIASES = liblocale.so ;
|
||||
if $(TARGET_ARCH) = x86 {
|
||||
local lib ;
|
||||
for lib in $(SYSTEM_LIBS_LIBBE_ALIASES) {
|
||||
AddSymlinkToHaikuHybridImage system lib : libbe.so : $(lib) : : true ;
|
||||
}
|
||||
}
|
||||
|
||||
SYSTEM_LIBS_ALIASES =
|
||||
$(SYSTEM_LIBS_LIBNETWORK_ALIASES)
|
||||
libnetapi.so
|
||||
$(SYSTEM_LIBS_LIBGL_ALIASES)
|
||||
$(SYSTEM_LIBS_LIBBE_ALIASES)
|
||||
;
|
||||
|
||||
# libfreetype.so links to the current freetype lib
|
||||
|
||||
Reference in New Issue
Block a user