haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update cmake 2.8.11.2 patchset.

Browse Source 
Rework Haiku CPU detection backend to use newer CPU
topology/information APIs for frequency calculation.
This commit is contained in:
Rene Gollent
2014-03-03 16:57:55 -05:00
parent 6cc937717a
commit 8dbdecf72f
1 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dev-util/cmake/patches/cmake-2.8.11.2.patchset
View File

@@ -1,4 +1,4 @@
From b9cf2352503777e90fec9db9416f4bf6c793b1f4 Mon Sep 17 00:00:00 2001
From 1d587bbcbad19d5159f6fea4a321bf6a07bd7105 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 16:26:02 +0200
Subject: Several fixes to Haiku platform module
@@ -212,7 +212,7 @@ index 5c43052..f00cbd6 100644
1.8.3.4
From 99381ca06fb2d010a7b12ec413855f1c3a99c2c8 Mon Sep 17 00:00:00 2001
From 0a6815d452ef64e7daff785a7fbf5732b21e95b3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 16:31:36 +0200
Subject: Remove use of B_COMMON_DIRECTORY
@@ -363,7 +363,7 @@ index ee5b9d8..1369dab 100644
1.8.3.4
From c9b1d5be9feb7d1d22f4aa6ef83edd4fb62ff97d Mon Sep 17 00:00:00 2001
From 8708f2b2761e1467c96f42d9e4c83e645b601287 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 16:33:52 +0200
Subject: Remove useless preprocessor checks
@@ -449,7 +449,7 @@ index 74ef1f8..3053cd8 100644
1.8.3.4
From 22ebddf5e418d248b74a966096e7c75400dba422 Mon Sep 17 00:00:00 2001
From 658016cb993a786c2d5ff9ae96f28b60529f2868 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 16:59:25 +0200
Subject: Include files cleanup
@@ -500,7 +500,7 @@ index 61c1572..fc0215e 100644
1.8.3.4
From 81f62c78a541298c4f989eade02bf48f8206fab2 Mon Sep 17 00:00:00 2001
From 570101cdfddf50182bea0d3b24aa8fc5d980ab6c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Oct 2013 17:01:03 +0200
Subject: FindSDL: Fix broken include paths
@@ -525,7 +525,7 @@ index fec142e..6adec1f 100644
1.8.3.4
From fd48834c43e75c3b151afb046f3a9025ab29adb7 Mon Sep 17 00:00:00 2001
From 04575f63ff3b05cefba384667defda6e16b99a9d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 14 Oct 2013 09:35:02 +0200
Subject: Enable command-line length limitation on Haiku.
@@ -548,7 +548,7 @@ index 7e48cd7..3d15900 100644
1.8.3.4
From f37bdac542180d045d1bf213ee6d78ed0f46684a Mon Sep 17 00:00:00 2001
From 296607343aab4e0e8762104ca2bff6da0973539c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 17 Oct 2013 19:27:38 +0200
Subject: Enable ELF support on Haiku
@@ -657,7 +657,7 @@ index 0000000..6b868bb
1.8.3.4
From 9721c802a88d20b2f724909e6cce07295002bedd Mon Sep 17 00:00:00 2001
From 9e7428567599bd566aa8680e6e09ecee28c54bab Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 17 Oct 2013 19:35:25 +0200
Subject: CPack: add Haiku hpkg support
@@ -1602,7 +1602,7 @@ index 0000000..ffa803d
1.8.3.4
From 4c66402a7b630969a74878a90af03c72edce3844 Mon Sep 17 00:00:00 2001
From 85631af98a7204959db7cf8e9abedc52b1b7c2d6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 12 Nov 2013 15:15:33 +0100
Subject: Remove remaining references to "common" directory.
@@ -1651,7 +1651,7 @@ index 825f851..a3ebe24 100644
1.8.3.4
From 95e14820c12369366cffae5050efabebf5b51c0d Mon Sep 17 00:00:00 2001
From de31f720462b7589a7c44ca8c13a39abbd7f2191 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 12 Nov 2013 15:48:13 +0100
Subject: Fix compiler detection when distcc is involved
@@ -1699,7 +1699,7 @@ index a3ebe24..dd4c55e 100644
1.8.3.4
From 748a5f0f1db2efaf411655206b74a85f9417a9c9 Mon Sep 17 00:00:00 2001
From 106b40a8444dde739ac5295b785474b7ca13ebb7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Nov 2013 17:49:55 +0100
Subject: CPack: fix architecture detection and packager check
@@ -1772,7 +1772,7 @@ index dd4c55e..36576d1 100644
1.8.3.4
From 6746cfb5f706471d49f243a036589be7f6f0e226 Mon Sep 17 00:00:00 2001
From 876c0bffbbdf5c77ebc5f072f025e8cc3f6d0828 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 22:24:23 +0100
Subject: Make sure the extraction of secondary arch works
@@ -1797,7 +1797,7 @@ index 36576d1..3d06566 100644
1.8.3.4
From 3f7e225897df9e71dee6745cca2ec4f1defd0298 Mon Sep 17 00:00:00 2001
From 3a261e325314152375f3ec0a670c96416562847f Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Jan 2014 22:46:37 +0100
Subject: Fix search directories for SDL image,mixer,ttf.
@@ -1848,7 +1848,7 @@ index bb0ca91..91577d6 100644
1.8.3.4
From bef51860a4e8f12504d8fbd9f421624932f927ad Mon Sep 17 00:00:00 2001
From bedbd8de5e3b520b82bfd8c69c6634db2e0a17f4 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 13 Jan 2014 20:35:48 +0100
Subject: FindFreetype: fix search path.
@@ -1870,3 +1870,44 @@ index 1df2399..31346a0 100644
--
1.8.3.4
From 1b8453c65fdfddc529097fad179ded9e699eef90 Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Mon, 3 Mar 2014 16:56:33 -0500
Subject: Rework CPU frequency calculation to use newer topology APIs.
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 9e2a93d..4b5ad8f 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -4354,8 +4354,25 @@ bool SystemInformationImplementation::QueryHaikuInfo()
system_info info;
get_system_info(&info);
+ uint32 topologyNodeCount = 0;
+ cpu_topology_node_info* topology = NULL;
+ get_cpu_topology_info(NULL, &topologyNodeCount);
+ if (topologyNodeCount != 0)
+ topology = new cpu_topology_node_info[topologyNodeCount];
+ get_cpu_topology_info(topology, &topologyNodeCount);
+
+ uint64 cpuFrequency = 0;
+ for (uint32 i = 0; i < topologyNodeCount; i++) {
+ if (topology[i].type == B_TOPOLOGY_CORE) {
+ cpuFrequency = topology[i].data.core.default_frequency;
+ break;
+ }
+ }
+
+ delete[] topology;
+
this->NumberOfPhysicalCPU = info.cpu_count;
- this->CPUSpeedInMHz = info.cpu_clock_speed / 1000000.0F;
+ this->CPUSpeedInMHz = cpuFrequency / 1000000.0f;
// Physical Memory
this->TotalPhysicalMemory = (info.max_pages * B_PAGE_SIZE) / (1024 * 1024) ;
--
1.8.3.4