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

Support building most system libraries for secondary arch

Browse Source 
Also adjust the HaikuImageGet[Private]SystemLibs rules to support to
return the library targets matching the current architecture.
This commit is contained in:
Ingo Weinhold
2013-08-06 00:45:22 +02:00
parent 040a81419d
commit 225b638263
18 changed files with 521 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
+19 -15
View File
@@ -67,31 +67,35 @@ SYSTEM_DEMOS = [ FFilterByBuildFeatures
rule HaikuImageGetSystemLibs
{
return [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
libgame.so libGL.so@x86 libglut.so@x86
libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so
libpackage.so
<revisioned>libroot.so
libscreensaver.so
libtextencoding.so libtiff.so libtracker.so libtranslation.so
$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
] ;
return
# libs with special grist
[ MultiArchDefaultGristFiles libroot.so : revisioned ]
$(HAIKU_SHARED_LIBSTDC++_$(TARGET_PACKAGING_ARCH))
$(HAIKU_SHARED_LIBSUPC++_$(TARGET_PACKAGING_ARCH))
# libs with standard grist
[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
libgame.so libGL.so@x86 libglut.so@x86
libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so
libpackage.so
libscreensaver.so
libtextencoding.so libtiff.so libtracker.so libtranslation.so
] ]
;
}
rule HaikuImageGetPrivateSystemLibs
{
return [ FFilterByBuildFeatures
return [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
libalm.so
libfluidsynth.so
libilmimf.so
libpackage-add-on-libsolv.so
libroot-addon-icu.so
] ;
] ] ;
}
build/jam/images/HaikuImageBootstrap
+20 -16
View File
@@ -63,31 +63,35 @@ SYSTEM_DEMOS = ;
rule HaikuImageGetSystemLibs
{
return [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
libgame.so
libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so
libpackage.so
<revisioned>libroot.so
libscreensaver.so
libtextencoding.so libtracker.so libtranslation.so
$(HAIKU_SHARED_LIBSTDC++_$(HAIKU_PACKAGING_ARCH))
$(HAIKU_SHARED_LIBSUPC++_$(HAIKU_PACKAGING_ARCH))
] ;
return
# libs with special grist
[ MultiArchDefaultGristFiles libroot.so : revisioned ]
$(HAIKU_SHARED_LIBSTDC++_$(TARGET_PACKAGING_ARCH))
$(HAIKU_SHARED_LIBSUPC++_$(TARGET_PACKAGING_ARCH))
# libs with standard grist
[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
libgame.so
libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so
libpackage.so
libscreensaver.so
libtextencoding.so libtracker.so libtranslation.so
] ]
;
}
rule HaikuImageGetPrivateSystemLibs
{
return [ FFilterByBuildFeatures
return [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
libalm.so
# libfluidsynth.so
libfluidsynth.so
# libilmimf.so
libpackage-add-on-libsolv.so
libroot-addon-icu.so
] ;
] ] ;
}