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

Replace build system vars [PRIVATE_]SYSTEM_LIBS by rules

Browse Source 
... HaikuImageGetSystemLibs and HaikuImageGetPrivateSystemLibs.
This commit is contained in:
Ingo Weinhold
2013-08-05 23:25:08 +02:00
parent d20975d920
commit 69c69a7d2a
5 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
+16 -4
View File
@@ -63,7 +63,11 @@ SYSTEM_DEMOS = [ FFilterByBuildFeatures
$(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@x86 Mandelbrot OverlayImage Pairs $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@x86 Mandelbrot OverlayImage Pairs
Playground Pulse Sudoku Playground Pulse Sudoku
] ; ] ;
SYSTEM_LIBS = [ FFilterByBuildFeatures
rule HaikuImageGetSystemLibs
{
return [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so libdebug.so libdevice.so
libgame.so libGL.so@x86 libglut.so@x86 libgame.so libGL.so@x86 libglut.so@x86
@@ -75,14 +79,22 @@ SYSTEM_LIBS = [ FFilterByBuildFeatures
libtextencoding.so libtiff.so libtracker.so libtranslation.so libtextencoding.so libtiff.so libtracker.so libtranslation.so
$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH)) $(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH)) $(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
] ; ] ;
PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures }
rule HaikuImageGetPrivateSystemLibs
{
return [ FFilterByBuildFeatures
libalm.so libalm.so
libfluidsynth.so libfluidsynth.so
libilmimf.so libilmimf.so
libpackage-add-on-libsolv.so libpackage-add-on-libsolv.so
libroot-addon-icu.so libroot-addon-icu.so
] ; ] ;
}
SYSTEM_SERVERS = [ FFilterByBuildFeatures SYSTEM_SERVERS = [ FFilterByBuildFeatures
app_server cddb_daemon debug_server dns_resolver_server input_server app_server cddb_daemon debug_server dns_resolver_server input_server
keystore_server mail_daemon media_addon_server media_server midi_server keystore_server mail_daemon media_addon_server media_server midi_server
build/jam/images/HaikuImageBootstrap
+16 -4
View File
@@ -59,7 +59,11 @@ SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
Shortcuts Time Touchpad <preference>Tracker VirtualMemory Shortcuts Time Touchpad <preference>Tracker VirtualMemory
] ; ] ;
SYSTEM_DEMOS = ; SYSTEM_DEMOS = ;
SYSTEM_LIBS = [ FFilterByBuildFeatures
rule HaikuImageGetSystemLibs
{
return [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so libdebug.so libdevice.so
libgame.so libgame.so
@@ -71,14 +75,22 @@ SYSTEM_LIBS = [ FFilterByBuildFeatures
libtextencoding.so libtracker.so libtranslation.so libtextencoding.so libtracker.so libtranslation.so
$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH)) $(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH)) $(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
] ; ] ;
PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures }
rule HaikuImageGetPrivateSystemLibs
{
return [ FFilterByBuildFeatures
libalm.so libalm.so
# libfluidsynth.so # libfluidsynth.so
# libilmimf.so # libilmimf.so
libpackage-add-on-libsolv.so libpackage-add-on-libsolv.so
libroot-addon-icu.so libroot-addon-icu.so
] ; ] ;
}
SYSTEM_SERVERS = [ FFilterByBuildFeatures SYSTEM_SERVERS = [ FFilterByBuildFeatures
app_server debug_server dns_resolver_server input_server app_server debug_server dns_resolver_server input_server
keystore_server media_addon_server keystore_server media_addon_server
build/jam/packages/Haiku
+2 -1
View File
@@ -87,7 +87,8 @@ AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ; AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
# libs # libs
AddLibrariesToPackage lib : $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ; AddLibrariesToPackage lib
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
# libnetwork.so replaces quite a few libraries # libnetwork.so replaces quite a few libraries
SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ; SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ;
build/jam/packages/HaikuBootstrap
+2 -1
View File
@@ -86,7 +86,8 @@ AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ; AddFilesToPackage : <revisioned>kernel_$(TARGET_ARCH) ;
# libs # libs
AddLibrariesToPackage lib : $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ; AddLibrariesToPackage lib
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
# libnetwork.so replaces quite a few libraries # libnetwork.so replaces quite a few libraries
SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ; SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ;
build/jam/packages/HaikuDevel
+1 -1
View File
@@ -25,7 +25,7 @@ AddFilesToPackage lib : $(developmentLibs) ;
# library symlinks # library symlinks
local lib ; local lib ;
for lib in $(SYSTEM_LIBS) $(developmentLibs) { for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
AddSymlinkToPackage $(developDirTokens) lib : /system/lib $(lib:BS) ; AddSymlinkToPackage $(developDirTokens) lib : /system/lib $(lib:BS) ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) { if $(abiVersion) {