220d040227
* Instead of faking libstdc++.so from libstdc++.a, use libstdc++.so from the gcc_syslibs build feature for everything except x86_gcc2. * Use libgcc_s.so from the gcc_syslibs build feature for everything but x86_gcc2 (which still carries libgcc as part of libroot.so). * Drop filtering of libgcc objects for libroot, as that is no longer necessary since we're only using libgcc-as-single-object for libroot with x86_gcc2, where the filtered object file doesn't exist. Should the objects that used to be filtered cause any problems as part of libgcc_s.so, we can always filter them as part of the gcc build. * Use libsupc++.so from the gcc_syslibs build feature for everything but x86_gcc2. * Adjust all Jamfiles accordingly. * Deactivate building of faked libstdc++.so for non-x86-gcc2. For x86_gcc2, we still build libstdc++.so from the sources in the Haiku source tree as part of the Haiku build . * Put gcc_syslibs package onto the image, when needed.
127 lines
3.5 KiB
Plaintext
127 lines
3.5 KiB
Plaintext
SubDir HAIKU_TOP src kits ;
|
|
|
|
# If defined allows to run applications without the registrar
|
|
# -- for development only, of course.
|
|
if $(RUN_WITHOUT_REGISTRAR) {
|
|
local defines = [ FDefines RUN_WITHOUT_REGISTRAR ] ;
|
|
SubDirCcFlags $(defines) ;
|
|
SubDirC++Flags $(defines) ;
|
|
}
|
|
|
|
# If defined allows to run applications without the app server
|
|
# -- needed until the app server runs on our kernel.
|
|
RUN_WITHOUT_APP_SERVER ?= 0 ;
|
|
if $(RUN_WITHOUT_APP_SERVER) != 0 {
|
|
local defines = [ FDefines RUN_WITHOUT_APP_SERVER ] ;
|
|
SubDirCcFlags $(defines) ;
|
|
SubDirC++Flags $(defines) ;
|
|
}
|
|
|
|
UsePrivateHeaders app interface kernel locale print shared ;
|
|
|
|
# Build our libbe.so
|
|
|
|
local architectureObject ;
|
|
for architectureObject in [ MultiArchSubDirSetup ] {
|
|
on $(architectureObject) {
|
|
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
|
local libbe = [ MultiArchDefaultGristFiles libbe.so ] ;
|
|
|
|
AddResources $(libbe) :
|
|
libbe_version.rdef CountryFlags.rdef LanguageFlags.rdef
|
|
;
|
|
|
|
SetVersionScript $(libbe) : libbe_versions ;
|
|
|
|
SharedLibrary $(libbe) : :
|
|
<libbe!$(architecture)>app_kit.o
|
|
<libbe!$(architecture)>interface_kit.o
|
|
<libbe!$(architecture)>locale_kit.o
|
|
<libbe!$(architecture)>storage_kit.o
|
|
<libbe!$(architecture)>support_kit.o
|
|
|
|
[ MultiArchDefaultGristFiles libstorage_kit_mime.a ]
|
|
|
|
[ MultiArchDefaultGristFiles libicon.a ]
|
|
[ MultiArchDefaultGristFiles libagg.a ]
|
|
|
|
[ TargetLibstdc++ ]
|
|
[ BuildFeatureAttribute icu : libraries ]
|
|
[ BuildFeatureAttribute zlib : library ]
|
|
;
|
|
}
|
|
}
|
|
|
|
# Build libbe_test.so
|
|
|
|
SetSupportedPlatformsForTarget libbe_test.so : libbe_test ;
|
|
|
|
SetVersionScript libbe_test.so : libbe_test_versions ;
|
|
|
|
UsePrivateHeaders storage mime ;
|
|
|
|
SharedLibrary libbe_test.so :
|
|
:
|
|
<libbe!$(HAIKU_PACKAGING_ARCH)>app_kit.o
|
|
<libbe!$(HAIKU_PACKAGING_ARCH)>interface_kit.o
|
|
<libbe!$(HAIKU_PACKAGING_ARCH)>locale_kit.o
|
|
<libbe!$(HAIKU_PACKAGING_ARCH)>storage_kit.o
|
|
<libbe!$(HAIKU_PACKAGING_ARCH)>support_kit.o
|
|
|
|
[ MultiArchDefaultGristFiles libstorage_kit_mime.a ]
|
|
|
|
[ MultiArchDefaultGristFiles libicon.a ]
|
|
[ MultiArchDefaultGristFiles libagg.a ]
|
|
|
|
[ TargetLibstdc++ ]
|
|
[ BuildFeatureAttribute icu : libraries ]
|
|
[ BuildFeatureAttribute zlib : library ]
|
|
;
|
|
|
|
SEARCH_SOURCE += [ FDirName $(SUBDIR) interface ] ;
|
|
SEARCH_SOURCE += [ FDirName $(SUBDIR) interface textview_support ] ;
|
|
SEARCH_SOURCE += [ FDirName $(SUBDIR) shared ] ;
|
|
|
|
DoCatalogs libbe.so
|
|
: x-vnd.Haiku-libbe
|
|
:
|
|
AboutMenuItem.cpp
|
|
AboutWindow.cpp
|
|
ColorControl.cpp
|
|
Dragger.cpp
|
|
Menu.cpp
|
|
PrintJob.cpp
|
|
StringForSize.cpp
|
|
TextView.cpp
|
|
ZombieReplicantView.cpp
|
|
;
|
|
|
|
#SEARCH on [ FGristFiles KMessage.cpp ]
|
|
# = [ FDirName $(HAIKU_TOP) src system kernel messaging ] ;
|
|
#
|
|
#SEARCH on [ FGristFiles syslog.cpp ]
|
|
# = [ FDirName $(HAIKU_TOP) src system libroot posix ] ;
|
|
|
|
|
|
SubInclude HAIKU_TOP src kits app ;
|
|
SubInclude HAIKU_TOP src kits bluetooth ;
|
|
SubInclude HAIKU_TOP src kits debug ;
|
|
SubInclude HAIKU_TOP src kits device ;
|
|
SubInclude HAIKU_TOP src kits game ;
|
|
SubInclude HAIKU_TOP src kits interface ;
|
|
SubInclude HAIKU_TOP src kits locale ;
|
|
SubInclude HAIKU_TOP src kits mail ;
|
|
SubInclude HAIKU_TOP src kits media ;
|
|
SubInclude HAIKU_TOP src kits midi ;
|
|
SubInclude HAIKU_TOP src kits midi2 ;
|
|
SubInclude HAIKU_TOP src kits network ;
|
|
SubInclude HAIKU_TOP src kits package ;
|
|
SubInclude HAIKU_TOP src kits print ;
|
|
SubInclude HAIKU_TOP src kits screensaver ;
|
|
SubInclude HAIKU_TOP src kits shared ;
|
|
SubInclude HAIKU_TOP src kits storage ;
|
|
SubInclude HAIKU_TOP src kits support ;
|
|
SubInclude HAIKU_TOP src kits textencoding ;
|
|
SubInclude HAIKU_TOP src kits tracker ;
|
|
SubInclude HAIKU_TOP src kits translation ;
|