47320dd0ab
Jam comparison logic is string-based, and so was detecting GCC >= 10 as being < 2. This rectifies that by removing the GCC version parsing from Jam logic entirely, and setting various BuildConfig variables instead. Change-Id: I0c0ae3b9002fb5e77f9ca7a78600c91871657f03 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3293 Reviewed-by: Adrien Destugues <pulkomandy@gmail.com> Reviewed-by: Jérôme Duval <jerome.duval@gmail.com> Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
43 lines
1.3 KiB
Plaintext
43 lines
1.3 KiB
Plaintext
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
|
|
|
|
|
local haikuPackage = haiku_$(architecture).hpkg ;
|
|
HaikuPackage $(haikuPackage) ;
|
|
|
|
|
|
# libs
|
|
AddLibrariesToPackage lib $(architecture)
|
|
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
|
|
|
|
# libnetwork.so replaces quite a few libraries
|
|
if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 {
|
|
local libNetworkAliases = libsocket.so libbind.so libnet.so ;
|
|
local lib ;
|
|
for lib in $(libNetworkAliases) {
|
|
AddSymlinkToPackage lib $(architecture) : libnetwork.so : $(lib) ;
|
|
}
|
|
|
|
AddSymlinkToPackage lib $(architecture) : libbnetapi.so : libnetapi.so ;
|
|
}
|
|
|
|
|
|
# # add-ons
|
|
local addOnsDir = add-ons $(architecture) ;
|
|
#
|
|
# AddFilesToPackage $(addOnsDir) accelerants
|
|
# : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
|
|
AddFilesToPackage $(addOnsDir) Translators
|
|
: [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_TRANSLATORS) ] ;
|
|
# AddFilesToPackage $(addOnsDir) locale catalogs
|
|
# : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
|
|
#
|
|
AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
|
|
AddFilesToPackage $(addOnsDir) media plugins
|
|
: [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ] ;
|
|
#
|
|
# AddFilesToPackage $(addOnsDir) disk_systems
|
|
# : <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;
|
|
|
|
|
|
BuildHaikuPackage $(haikuPackage) : haiku_secondary ;
|