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

src/kits/network/Jamfile

@@ -1,9 +1,19 @@
 SubDir HAIKU_TOP src kits network ;
 
 UsePrivateHeaders app libroot net shared ;
+
+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 ;
 
-SharedLibrary libnetwork.so :
+		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!$(architecture)>libbind.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
 			$(TARGET_LIBSUPC++)
 			;
 
-local services = [ FGristFiles services ] ;
+		AddFileDataAttribute $(libnetwork) : services : string : $(services) ;
-SEARCH on $(services) = [ FDirName $(SUBDIR) libbind defaults ] ;
+	}
-AddFileDataAttribute libnetwork.so : services : string : $(services) ;
+}
 
 SubInclude HAIKU_TOP src kits network libbind ;
 SubInclude HAIKU_TOP src kits network libnetapi ;

src/kits/network/libbind/Jamfile

@@ -1,6 +1,9 @@
 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) ;
@@ -25,14 +28,14 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) resolv ] ;
 			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

@@ -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
 	;
 
+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

@@ -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 ] ;
+			# 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 ;
 
-StaticLibrary libshared.a :
+		StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
 			AboutMenuItem.cpp
 			AboutWindow.cpp
 			ArgumentVector.cpp
@@ -38,7 +47,11 @@ StaticLibrary libshared.a :
 			Variant.cpp
 			;
 
-Includes [ FGristFiles Keymap.cpp ] : <src!servers!input>SystemKeymap.h ;
+		Includes [ FGristFiles Keymap.cpp ]
+			: <src!servers!input>SystemKeymap.h ;
+	}
+}
+
 
 UseLibraryHeaders mapm ;
 

src/libs/agg/Jamfile

@@ -8,9 +8,12 @@ UseLibraryHeaders agg ;
 SubDirCcFlags -w ;
 SubDirC++Flags -w ;
 
+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
@@ -38,4 +41,5 @@ StaticLibrary libagg.a :
 			agg_vpgen_clip_polyline.cpp
 			agg_vpgen_segmentator.cpp
 			;
-
+	}
+}

src/libs/icon/Jamfile

@@ -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
@@ -61,4 +65,5 @@ StaticLibrary libicon.a :
 			IconRenderer.cpp
 			IconUtils.cpp
 			;
-
+	}
+}