NetServices: include libnetservices2.a in the HaikuDevel package

Change-Id: I88e888df5ac7673ab343e25b7216546cb7ca6055
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5799
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>

build/jam/packages/HaikuDevel

@@ -45,6 +45,13 @@ AddFilesToPackage develop lib :
 	libpthread.a libprint.a libprintutils.a
 	<$(architecture)>libshared.a ;
 
+# libnetservices2.a
+if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 0 {
+	# Modern C++ only; skip on gcc2
+	AddFilesToPackage develop lib :
+		<$(architecture)>libnetservices2.a ;
+}
+
 # the POSIX error code mapper library
 AddFilesToPackage develop lib : libposix_error_mapper.a ;
 

build/jam/packages/HaikuDevelSecondary

@@ -42,6 +42,13 @@ AddFilesToPackage develop lib $(architecture) :
 	<$(architecture)>libpthread.a
 	<$(architecture)>libshared.a ;
 
+# libnetservices2.a
+if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 0 {
+	# Modern C++ only; skip on gcc2
+	AddFilesToPackage develop lib $(architecture) :
+		<$(architecture)>libnetservices2.a ;
+}
+
 # the POSIX error code mapper library
 AddFilesToPackage develop lib $(architecture)
 	: libposix_error_mapper.a ;

src/kits/network/libnetservices2/Jamfile

@@ -17,7 +17,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 
 		SubDirC++Flags -std=gnu++17 ;
 
-		StaticLibrary [ MultiArchDefaultGristFiles libnetservices2.a ] :
+		StaticLibrary <$(architecture)>libnetservices2.a :
 			ErrorsExt.cpp
 			HttpBuffer.cpp
 			HttpFields.cpp
@@ -30,7 +30,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			NetServicesMisc.cpp
 			;
 
-		LinkAgainst [ MultiArchDefaultGristFiles libnetservices.a ] :
+		LinkAgainst <$(architecture)>libnetservices.a :
 			<$(architecture)>libshared.a ;
 
 	}

src/tests/kits/net/netservices2/Jamfile

@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src tests kits net netservices2 ;
 
 if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
 	# do not target the legacy platform
+	local architecture = $(TARGET_PACKAGING_ARCH) ;
 	UsePrivateHeaders netservices2 shared ;
 
 	UnitTestLib netservicekit2test.so :
@@ -12,7 +13,7 @@ if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
 		HttpProtocolTest.cpp
 		TestServer.cpp
 
-		: be libnetservices2.a $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB)
+		: be <$(architecture)>libnetservices2.a $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB)
 		[ TargetLibstdc++ ]
 		;
 }