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>
59 lines
1.7 KiB
Plaintext
59 lines
1.7 KiB
Plaintext
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
|
|
|
|
|
local haikuDevelPackage = haiku_$(architecture)_devel.hpkg ;
|
|
HaikuPackage $(haikuDevelPackage) ;
|
|
|
|
local arch = $(TARGET_ARCH) ;
|
|
|
|
# glue code
|
|
AddFilesToPackage develop lib $(architecture) :
|
|
<src!system!glue!arch!$(arch)!$(architecture)>crti.o
|
|
<src!system!glue!arch!$(arch)!$(architecture)>crtn.o
|
|
<src!system!glue!$(architecture)>init_term_dyn.o
|
|
<src!system!glue!$(architecture)>start_dyn.o
|
|
<src!system!glue!$(architecture)>haiku_version_glue.o
|
|
;
|
|
|
|
# additional libraries
|
|
local developmentLibs = [ MultiArchDefaultGristFiles libroot_debug.so : revisioned ] ;
|
|
AddFilesToPackage lib $(architecture) : $(developmentLibs) ;
|
|
|
|
# library symlinks
|
|
local lib ;
|
|
for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
|
|
AddSymlinkToPackage develop lib $(architecture)
|
|
: /system/lib/$(architecture) $(lib:BS) ;
|
|
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
|
|
if $(abiVersion) {
|
|
local abiVersionedLib = $(lib:BS).$(abiVersion) ;
|
|
AddSymlinkToPackage develop lib $(architecture)
|
|
: /system/lib/$(architecture) $(abiVersionedLib) ;
|
|
}
|
|
}
|
|
|
|
# static libraries
|
|
AddFilesToPackage develop lib $(architecture) :
|
|
<$(architecture)>libc.a
|
|
<$(architecture)>libcolumnlistview.a
|
|
<$(architecture)>liblocalestub.a
|
|
<$(architecture)>libm.a
|
|
<$(architecture)>libpthread.a
|
|
<$(architecture)>libshared.a ;
|
|
|
|
# the POSIX error code mapper library
|
|
AddFilesToPackage develop lib $(architecture)
|
|
: libposix_error_mapper.a ;
|
|
|
|
# ABI independent stuff
|
|
|
|
# cpp headers
|
|
if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 {
|
|
# GCC 2 only -- for GCC 4 they come with the gcc package
|
|
CopyDirectoryToPackage develop headers c++
|
|
: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 ;
|
|
}
|
|
|
|
|
|
BuildHaikuPackage $(haikuDevelPackage) : haiku_devel_secondary ;
|