[haiku-commits] r38485 - haiku/trunk/src/system/boot/loader/net

Author: andreasf
Date: 2010-09-01 00:57:33 +0200 (Wed, 01 Sep 2010)
New Revision: 38485
Changeset: http://dev.haiku-os.org/changeset/38485

Modified:
   haiku/trunk/src/system/boot/loader/net/Jamfile
   haiku/trunk/src/system/boot/loader/net/NetStack.cpp
Log:
boot_net: Disable TCP for all archs but ppc

Unbreaks the build until a better solution is found.


Modified: haiku/trunk/src/system/boot/loader/net/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/loader/net/Jamfile      2010-08-31 22:07:50 UTC 
(rev 38484)
+++ haiku/trunk/src/system/boot/loader/net/Jamfile      2010-08-31 22:57:33 UTC 
(rev 38485)
@@ -4,6 +4,11 @@
 
 SubDirC++Flags -fno-rtti ;
 
+local tcp = ;
+if $(TARGET_ARCH) = ppc {
+       tcp = TCP.cpp ;
+}
+
 KernelStaticLibrary boot_net :
        ARP.cpp
        ChainBuffer.cpp
@@ -13,7 +18,7 @@
        NetStack.cpp
        RemoteDisk.cpp
        UDP.cpp
-       TCP.cpp
+       $(tcp)
 
        : -fno-pic
 ;

Modified: haiku/trunk/src/system/boot/loader/net/NetStack.cpp
===================================================================
--- haiku/trunk/src/system/boot/loader/net/NetStack.cpp 2010-08-31 22:07:50 UTC 
(rev 38484)
+++ haiku/trunk/src/system/boot/loader/net/NetStack.cpp 2010-08-31 22:57:33 UTC 
(rev 38485)
@@ -76,6 +76,7 @@
        if (error != B_OK)
                return error;
 
+#ifdef __POWERPC__
        // TCP service
        fTCPService = new(nothrow) TCPService(fIPService);
        if (fTCPService == NULL)
@@ -83,6 +84,7 @@
        error = fTCPService->Init();
        if (error != B_OK)
                return error;
+#endif
 
        return B_OK;
 }


Other related posts:

  • » [haiku-commits] r38485 - haiku/trunk/src/system/boot/loader/net - andreas . faerber