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

lib{network,package,shared,agg,icon}: secondary arch support

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-05 06:41:53 +02:00
parent a36a166632
commit 7bd562abc9
6 changed files with 352 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/Jamfile
+17 -13
View File
@@ -1,9 +1,19 @@
SubDir HAIKU_TOP src kits network ;
UsePrivateHeaders app libroot net shared ;
UsePrivateSystemHeaders ;
SharedLibrary libnetwork.so :
local services = [ FGristFiles services ] ;
SEARCH on $(services) = [ FDirName $(SUBDIR) libbind defaults ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UsePrivateSystemHeaders ;
local libnetwork = [ MultiArchDefaultGristFiles libnetwork.so ] ;
SharedLibrary $(libnetwork) :
init.cpp
interfaces.cpp
notifications.cpp
@@ -11,19 +21,13 @@ SharedLibrary libnetwork.so :
r5_compatibility.cpp
:
be
<libbind>libbind_dst.o
<libbind>libbind_inet.o
<libbind>libbind_irs.o
<libbind>libbind_isc.o
<libbind>libbind_nameser.o
<libbind>libbind_resolv.o
<libbind>libbind_private.o
<libbind!$(architecture)>libbind.o
$(TARGET_LIBSUPC++)
;
;
local services = [ FGristFiles services ] ;
SEARCH on $(services) = [ FDirName $(SUBDIR) libbind defaults ] ;
AddFileDataAttribute libnetwork.so : services : string : $(services) ;
AddFileDataAttribute $(libnetwork) : services : string : $(services) ;
}
}
SubInclude HAIKU_TOP src kits network libbind ;
SubInclude HAIKU_TOP src kits network libnetapi ;
src/kits/network/libbind/Jamfile
+28 -29
View File
@@ -1,38 +1,41 @@
SubDir HAIKU_TOP src kits network libbind ;
SetSubDirSupportedPlatforms haiku ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName $(SUBDIR) include ] : true ;
SubDirSysHdrs $(SUBDIR) ;
UseHeaders [ FDirName $(SUBDIR) include ] : true ;
SubDirSysHdrs $(SUBDIR) ;
# private sources for this port
SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
# private sources for this port
SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
# BIND sources
SEARCH_SOURCE += [ FDirName $(SUBDIR) bsd ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) dst ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) inet ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) irs ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) isc ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) nameser ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) resolv ] ;
# BIND sources
SEARCH_SOURCE += [ FDirName $(SUBDIR) bsd ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) dst ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) inet ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) irs ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) isc ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) nameser ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) resolv ] ;
{
{
# we want to have the xxx_r functions, too
local defines = _REENTRANT=1 USE_MD5=1 ;
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;
}
}
MergeObject <libbind>libbind_dst.o :
MergeObject <libbind!$(architecture)>libbind.o :
# dst
dst_api.c
hmac_link.c
md5_dgst.c
support.c
;
MergeObject <libbind>libbind_inet.o :
# inet
inet_addr.c
inet_cidr_ntop.c
inet_cidr_pton.c
@@ -48,9 +51,8 @@ MergeObject <libbind>libbind_inet.o :
inet_ntop.c
inet_pton.c
nsap_addr.c
;
MergeObject <libbind>libbind_irs.o :
# irs
dns.c
dns_ho.c
dns_nw.c
@@ -93,9 +95,8 @@ MergeObject <libbind>libbind_irs.o :
nis.c
nul_ng.c
util.c
;
MergeObject <libbind>libbind_isc.o :
# isc
assertions.c
base64.c
bitncmp.c
@@ -114,9 +115,8 @@ MergeObject <libbind>libbind_isc.o :
memcluster.c
movefile.c
tree.c
;
MergeObject <libbind>libbind_nameser.o :
# nameser
ns_date.c
ns_name.c
ns_netint.c
@@ -126,9 +126,8 @@ MergeObject <libbind>libbind_nameser.o :
ns_sign.c
ns_ttl.c
ns_verify.c
;
MergeObject <libbind>libbind_resolv.o :
# resolv
herror.c
mtctxres.c
res_comp.c
@@ -142,9 +141,9 @@ MergeObject <libbind>libbind_resolv.o :
res_send.c
res_sendsigned.c
res_update.c
;
MergeObject <libbind>libbind_private.o :
# private functions
strsep.c
;
;
}
}
src/kits/package/Jamfile
+16 -10
View File
@@ -1,17 +1,11 @@
SubDir HAIKU_TOP src kits package ;
UseBuildFeatureHeaders zlib ;
UsePrivateHeaders
kernel
shared
storage
;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package solver ] ;
HPKG_SOURCES =
AttributeDataReader.cpp
BlockBufferPool.cpp
@@ -66,10 +60,19 @@ HPKG_SOURCES =
ZlibDecompressor.cpp
;
Includes [ FGristFiles $(HPKG_SOURCES) ]
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
UseBuildFeatureHeaders zlib ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package solver ] ;
Includes [ FGristFiles $(HPKG_SOURCES) ]
: [ BuildFeatureAttribute zlib : headers ] ;
SharedLibrary libpackage.so
SharedLibrary [ MultiArchDefaultGristFiles libpackage.so ]
:
ActivateRepositoryCacheJob.cpp
ActivateRepositoryConfigJob.cpp
@@ -119,9 +122,12 @@ SharedLibrary libpackage.so
SolverRepository.cpp
SolverResult.cpp
:
libshared.a be
[ MultiArchDefaultGristFiles libshared.a ]
be
[ BuildFeatureAttribute zlib : library ]
$(TARGET_LIBSTDC++)
;
;
}
}
HaikuSubInclude solver ;
src/kits/shared/Jamfile
+22 -9
View File
@@ -5,15 +5,24 @@ AddSubDirSupportedPlatforms libbe_test ;
UseLibraryHeaders agg ;
UsePrivateHeaders shared locale ;
UseHeaders [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH))
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UseHeaders [ FDirName
$(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCHS[1]))
servers input ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src kits ] ;
# For the generated SystemKeymap.h. We're fine with the one for the
# primary architecture.
UseHeaders [ FDirName $(HAIKU_TOP) src kits ] ;
# for RWLockManager only
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel libroot ;
# for RWLockManager only
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel libroot ;
StaticLibrary libshared.a :
StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
AboutMenuItem.cpp
AboutWindow.cpp
ArgumentVector.cpp
@@ -36,12 +45,16 @@ StaticLibrary libshared.a :
StringForRate.cpp
StringForSize.cpp
Variant.cpp
;
;
Includes [ FGristFiles Keymap.cpp ]
: <src!servers!input>SystemKeymap.h ;
}
}
Includes [ FGristFiles Keymap.cpp ] : <src!servers!input>SystemKeymap.h ;
UseLibraryHeaders mapm ;
StaticLibrary libexpression_parser.a :
ExpressionParser.cpp
;
;
src/libs/agg/Jamfile
+8 -4
View File
@@ -8,9 +8,12 @@ UseLibraryHeaders agg ;
SubDirCcFlags -w ;
SubDirC++Flags -w ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
StaticLibrary libagg.a :
StaticLibrary [ MultiArchDefaultGristFiles libagg.a ] :
# src
agg_arc.cpp
agg_arrowhead.cpp
@@ -37,5 +40,6 @@ StaticLibrary libagg.a :
agg_vpgen_clip_polygon.cpp
agg_vpgen_clip_polyline.cpp
agg_vpgen_segmentator.cpp
;
;
}
}
src/libs/icon/Jamfile
+13 -8
View File
@@ -13,17 +13,21 @@ local sourceDirs =
transformer
;
local sourceDir ;
for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs icon $(sourceDir) ] ;
}
# system headers
UseLibraryHeaders agg icon ;
UsePrivateHeaders shared ;
StaticLibrary libicon.a :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local sourceDir ;
for sourceDir in $(sourceDirs) {
SEARCH_SOURCE
+= [ FDirName $(HAIKU_TOP) src libs icon $(sourceDir) ] ;
}
StaticLibrary [ MultiArchDefaultGristFiles libicon.a ] :
# flat_icon
FlatIconFormat.cpp
FlatIconImporter.cpp
@@ -60,5 +64,6 @@ StaticLibrary libicon.a :
Icon.cpp
IconRenderer.cpp
IconUtils.cpp
;
;
}
}