From 429cbf22207b12910c26825c1103c178db205baf Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Wed, 2 Nov 2022 09:02:25 +0000 Subject: [PATCH] NetServices: include libnetservices2.a in the HaikuDevel package Change-Id: I88e888df5ac7673ab343e25b7216546cb7ca6055 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5799 Reviewed-by: waddlesplash Tested-by: Commit checker robot --- build/jam/packages/HaikuDevel | 7 +++++++ build/jam/packages/HaikuDevelSecondary | 7 +++++++ src/kits/network/libnetservices2/Jamfile | 4 ++-- src/tests/kits/net/netservices2/Jamfile | 3 ++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel index bc7e69de34..eb5324a170 100644 --- a/build/jam/packages/HaikuDevel +++ b/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 ; diff --git a/build/jam/packages/HaikuDevelSecondary b/build/jam/packages/HaikuDevelSecondary index 98a57c0040..35f0b95882 100644 --- a/build/jam/packages/HaikuDevelSecondary +++ b/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 ; diff --git a/src/kits/network/libnetservices2/Jamfile b/src/kits/network/libnetservices2/Jamfile index 5a38083241..8018be4e2c 100644 --- a/src/kits/network/libnetservices2/Jamfile +++ b/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 ; } diff --git a/src/tests/kits/net/netservices2/Jamfile b/src/tests/kits/net/netservices2/Jamfile index f4fba5b74f..5d12b58625 100644 --- a/src/tests/kits/net/netservices2/Jamfile +++ b/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++ ] ; }