| 1 |
commit: 384f21cbf2a1bc7a7d30fd443085d27185d305fc |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Aug 7 15:56:56 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 9 06:21:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384f21cb |
| 7 |
|
| 8 |
dev-ruby/concurrent-ruby: remove unused patch. |
| 9 |
|
| 10 |
.../files/concurrent-ruby-1.0.2-alpha.patch | 50 ---------------------- |
| 11 |
1 file changed, 50 deletions(-) |
| 12 |
|
| 13 |
diff --git a/dev-ruby/concurrent-ruby/files/concurrent-ruby-1.0.2-alpha.patch b/dev-ruby/concurrent-ruby/files/concurrent-ruby-1.0.2-alpha.patch |
| 14 |
deleted file mode 100644 |
| 15 |
index a1a97ece2b1..00000000000 |
| 16 |
--- a/dev-ruby/concurrent-ruby/files/concurrent-ruby-1.0.2-alpha.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,50 +0,0 @@ |
| 19 |
-commit af059a7ac7815d1edac67b21e5c1bd6b805d4493 |
| 20 |
-Author: Hans de Graaff <hans@××××××××.org> |
| 21 |
-Date: Mon Jul 4 20:09:25 2016 +0200 |
| 22 |
- |
| 23 |
- Support Alpha architecture for processor_count |
| 24 |
- |
| 25 |
- Alpha machines with Linux do have /proc/cpuinfo but its format is |
| 26 |
- different from normal Linux machines, and most specifically the |
| 27 |
- processor entry is missing. Moreover, Alpha machines can be configured |
| 28 |
- to compartimentalize their CPUs into different machines leading to |
| 29 |
- further confusion when reading /proc/cpuinfo. |
| 30 |
- |
| 31 |
- Using /usr/bin/nproc seems to be the most reliable method of determining |
| 32 |
- the number of processors on Alpha. Since reading /proc/cpuinfo is not |
| 33 |
- reliable this patch places the nproc method before trying /proc/cpuinfo. |
| 34 |
- |
| 35 |
- For futher reference see our downstream bug report at |
| 36 |
- https://bugs.gentoo.org/show_bug.cgi?id=587986 |
| 37 |
- |
| 38 |
-diff --git a/CHANGELOG.md b/CHANGELOG.md |
| 39 |
-index e84c683..18dd8cc 100644 |
| 40 |
---- a/CHANGELOG.md |
| 41 |
-+++ b/CHANGELOG.md |
| 42 |
-@@ -1,3 +1,5 @@ |
| 43 |
-+* Support Alpha with `Concurrent::processor_count` |
| 44 |
-+ |
| 45 |
- ## Current Release v1.0.2 (2 May 2016) |
| 46 |
- |
| 47 |
- * Fix bug with `Concurrent::Map` MRI backend `#inspect` method |
| 48 |
-diff --git a/lib/concurrent/utility/processor_counter.rb b/lib/concurrent/utility/processor_counter.rb |
| 49 |
-index d18b0bb..e82c0a6 100644 |
| 50 |
---- a/lib/concurrent/utility/processor_counter.rb |
| 51 |
-+++ b/lib/concurrent/utility/processor_counter.rb |
| 52 |
-@@ -28,6 +28,7 @@ module Concurrent |
| 53 |
- # processor", which taked into account hyperthreading. |
| 54 |
- # |
| 55 |
- # * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev |
| 56 |
-+ # * Alpha: /usr/bin/nproc (/proc/cpuinfo exists but cannot be used) |
| 57 |
- # * BSD: /sbin/sysctl |
| 58 |
- # * Cygwin: /proc/cpuinfo |
| 59 |
- # * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl |
| 60 |
-@@ -84,6 +85,8 @@ module Concurrent |
| 61 |
- result = WIN32OLE.connect("winmgmts://").ExecQuery( |
| 62 |
- "select NumberOfLogicalProcessors from Win32_Processor") |
| 63 |
- result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+) |
| 64 |
-+ elsif File.executable?("/usr/bin/nproc") |
| 65 |
-+ IO.popen("/usr/bin/nproc --all").read.to_i |
| 66 |
- elsif File.readable?("/proc/cpuinfo") |
| 67 |
- IO.read("/proc/cpuinfo").scan(/^processor/).size |
| 68 |
- elsif File.executable?("/usr/bin/hwprefs") |
Archives