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

HaikuDevel: a few simplifications

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-06 03:29:51 +02:00
parent 2f2f43699c
commit 096c687ea3
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/HaikuDevel
+10 -11
View File
@@ -5,10 +5,9 @@ local haikuDevelPackage = haiku_devel.hpkg ;
HaikuPackage $(haikuDevelPackage) ; HaikuPackage $(haikuDevelPackage) ;
local arch = $(TARGET_ARCH) ; local arch = $(TARGET_ARCH) ;
local developDirTokens = develop ;
# glue code # glue code
AddFilesToPackage $(developDirTokens) lib : AddFilesToPackage develop lib :
<src!system!glue!arch!$(arch)!$(architecture)>crti.o <src!system!glue!arch!$(arch)!$(architecture)>crti.o
<src!system!glue!arch!$(arch)!$(architecture)>crtn.o <src!system!glue!arch!$(arch)!$(architecture)>crtn.o
<src!system!glue!$(architecture)>init_term_dyn.o <src!system!glue!$(architecture)>init_term_dyn.o
@@ -17,7 +16,7 @@ AddFilesToPackage $(developDirTokens) lib :
; ;
# kernel # kernel
AddFilesToPackage $(developDirTokens) lib : kernel.so : _KERNEL_ ; AddFilesToPackage develop lib : kernel.so : _KERNEL_ ;
# additional libraries # additional libraries
local developmentLibs = <revisioned>libroot_debug.so ; local developmentLibs = <revisioned>libroot_debug.so ;
@@ -26,20 +25,20 @@ AddFilesToPackage lib : $(developmentLibs) ;
# library symlinks # library symlinks
local lib ; local lib ;
for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) { for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
AddSymlinkToPackage $(developDirTokens) lib : /system/lib $(lib:BS) ; AddSymlinkToPackage develop 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) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ; local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToPackage $(developDirTokens) lib AddSymlinkToPackage develop lib
: /system/lib $(abiVersionedLib) ; : /system/lib $(abiVersionedLib) ;
} }
} }
# static libraries # static libraries
AddFilesToPackage $(developDirTokens) lib : <$(architecture)>liblocalestub.a ; AddFilesToPackage develop lib : <$(architecture)>liblocalestub.a ;
# the POSIX error code mapper library # the POSIX error code mapper library
AddFilesToPackage $(developDirTokens) lib : libposix_error_mapper.a ; AddFilesToPackage develop lib : libposix_error_mapper.a ;
# ABI independent stuff # ABI independent stuff
@@ -64,7 +63,7 @@ CopyDirectoryToPackage develop headers private libs compat
: : -x *.c -x Jamfile ; : : -x *.c -x Jamfile ;
# create be -> os symlink for now # create be -> os symlink for now
AddSymlinkToPackage $(developDirTokens) headers : os : be ; AddSymlinkToPackage develop headers : os : be ;
# BSD and GNU compatibility headers # BSD and GNU compatibility headers
AddHeaderDirectoryToPackage compatibility bsd : bsd ; AddHeaderDirectoryToPackage compatibility bsd : bsd ;
@@ -77,8 +76,8 @@ if ! $(HAIKU_BOOTSTRAP_BUILD) {
# cpp headers # cpp headers
if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
# GCC 2 only -- for GCC 4 they come with the DevelopmentBase package # GCC 2 only -- for GCC 4 they come with the gcc package
CopyDirectoryToPackage $(developDirTokens) headers c++ CopyDirectoryToPackage develop headers c++
: [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 ; : [ FDirName $(HAIKU_TOP) headers cpp ] : 2.95.3 ;
} }
@@ -89,7 +88,7 @@ if $(TARGET_ARCH) = x86 && ! $(HAIKU_BOOTSTRAP_BUILD) {
local mesaGlHeadersDependency = [ BuildFeatureAttribute mesa : headers ] ; local mesaGlHeadersDependency = [ BuildFeatureAttribute mesa : headers ] ;
mesaGlHeaders = $(mesaGlHeaders:G=$(mesaGlHeadersDependency:G)) ; mesaGlHeaders = $(mesaGlHeaders:G=$(mesaGlHeadersDependency:G)) ;
Depends $(mesaGlHeaders) : $(mesaGlHeadersDependency) ; Depends $(mesaGlHeaders) : $(mesaGlHeadersDependency) ;
CopyDirectoryToPackage $(developDirTokens) headers os opengl CopyDirectoryToPackage develop headers os opengl
: $(mesaGlHeaders) : : : isTarget ; : $(mesaGlHeaders) : : : isTarget ;
} }