Apply fix for cuda compilation issues. Per bug #286779. Thx to Kacper Kowalik for the patch.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

3 files changed, 98 insertions, 2 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 5f2590b1b305..8f4306ea2aaa 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.73 2009/09/29 17:45:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.74 2009/09/30 11:32:31 scarabeus Exp $
+
+  30 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/6.6.40-cuda.patch:
+  Apply fix for cuda compilation issues. Per bug #286779. Thx to Kacper
+  Kowalik for the patch.
 
   29 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/6.6.40-as-needed.patch, -boinc-6.6.40.ebuild,
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index ce00a63d1d16..fd0695e2d7eb 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
 AUX 6.4.5-gcc44.patch 1831 RMD160 82aaff8e51077c712b318a473a77a69ec1e1b615 SHA1 bdd2f4baa48d7949d37150e926dcd0a0625caaf8 SHA256 63d9005aab4e60522f32484694c42f70d291b492c76a839aff348be052845fc4
 AUX 6.4.5-glibc210.patch 300 RMD160 0ca2f52c4265cf5a5763a7c1e2ce27bdc929bde8 SHA1 5a5a51b299e52d8a9ceba8c454b35488260721ea SHA256 b39db0c5208fc3c0a89ae0b0d809e5f8f72e7494c98e1b0b23eadcc5c8243377
 AUX 6.4.5-nostrip.patch 1052 RMD160 9a23c9cd8f3a47fe53fe8cccfca6d0b94587f716 SHA1 bae0a9de0c0980fd1f64e8b60a74548554dbe382 SHA256 f301d68819c4d93b930d4179ff2bb604d23ca7e221d843c6ed6cf65f27a53da2
 AUX 6.6.40-as-needed.patch 739 RMD160 64a80b43dc019c86f58714ad267bd4ec7f14f23a SHA1 23e210510481504be4a2d67ce82fd3b09a305c20 SHA256 58e4b1ed66c5f2c3f55b97e1807e77a6b908257d0e0d35247883e6eeca0cbee9
+AUX 6.6.40-cuda.patch 3443 RMD160 7e3eac368615499140d4fa80c561203cf2783757 SHA1 963e7f30730e199e40a08c36795e01a247cf08ff SHA256 0288b704e9eebbf29a3c76533d30e86c9a00bad6a9c5b1773afdedc7ee5c5bc7
 AUX 6.6.40-gui01.patch 466 RMD160 dfd2811e72ec98590e68c9ff368b3d8af2160d4c SHA1 53e37e9f75bcb9b4637becc640e7d6bce6cddcac SHA256 842e792c9b6061b5dd5fb9fe0de6a7ff1534277d22d4833b3f757c5ed249bb90
 AUX 6.6.40-locale.patch 616 RMD160 1986ca21be9ae6ddb7a88aaa69ada8dd6ff9a10e SHA1 90e3f7382a4b00658976cc8b6e2eb4a43706f478 SHA256 a6b6be0c60c29c2ac40bb26b99adc4de458819c197bfd376b28c487bdfcb8843
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
@@ -11,5 +15,12 @@ DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc
 DIST boinc-6.6.40.tar.bz2 9440539 RMD160 6595c0ee0dcf8d204862541039d5f74a0347dbcc SHA1 50c5f88e538ea14193df71d1954d5cabd7b5345d SHA256 16130f3a95e703dd1604039a2e5ce8c8e3ffbfe124beb8a49806b318fee46b7d
 EBUILD boinc-6.4.5-r2.ebuild 4359 RMD160 83d148188fd43b08c1b8912c71fdb80e86066509 SHA1 e5ffaf2626113ca936397b74f8c957fe8d3412b6 SHA256 0b22de626ebeceaf99bb6775c604e868408206fd3624b40bd30ec8afbb9946e4
 EBUILD boinc-6.6.40-r1.ebuild 3954 RMD160 c5ac872d5a4d8b9d7a18bdb90671cdd348776741 SHA1 1e29a7882c9b9a7aa30e12fe9b7edcabff175dcb SHA256 48b9b1d5e43071964f4e247a0bde00fa79c77d8f53e2dfac2efdd27412e496e7
-MISC ChangeLog 13850 RMD160 d821619bf23b88543dba45e4821a8bbe085c79c1 SHA1 c2f2f79f1567b3a1eb9d7e67360c70c49a9cf460 SHA256 862f766956b4c42a8b169e655c464bc629d0f7b6d8fc8fbc52b9fd5f8abba2b2
+MISC ChangeLog 14031 RMD160 4f725a5773b88323a5abf94ac75fca98e1955bd7 SHA1 45823e9486d15e80f8cec6de66a2abcf03e502c5 SHA256 413e221ac8d5ae0948dd9701a04e56e49672c002d9d0b02bf3212963e53796b0
 MISC metadata.xml 897 RMD160 8fbc078bbd2c887fa5f40908f23cebc97bf2427a SHA1 0dec3c60f214c346ca2c6073384d4c6411a2f6af SHA256 202c9489d999c43b25631e8259fea9711b668322b81bb3c359e018e8c445b086
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrDQeMACgkQHB6c3gNBRYexkQCdEEpBJ1nN3FgpdH3AjQisCDV+
+2YUAoKDv47DeKaSKFZTplKk8ILikr0oL
+=FxHn
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/files/6.6.40-cuda.patch b/sci-misc/boinc/files/6.6.40-cuda.patch
new file mode 100644
index 000000000000..30b4bba8d880
--- /dev/null
+++ b/sci-misc/boinc/files/6.6.40-cuda.patch
@@ -0,0 +1,80 @@
+--- boinc-6.6.40.orig/sched/handle_request.cpp	2009-01-14 00:06:02.000000000 +0100
++++ boinc-6.6.40/sched/handle_request.cpp	2009-09-30 12:22:12.230008604 +0200
+@@ -1172,7 +1172,7 @@
+ static inline bool requesting_work() {
+     if (g_request->work_req_seconds > 0) return true;
+     if (g_request->cpu_req_secs > 0) return true;
+-    if (coproc_cuda && coproc_cuda->req_secs) return true;
++    if (g_request->coproc_cuda && g_request->coproc_cuda->req_secs) return true; 
+     return false;
+ }
+ 
+--- boinc-6.6.40.orig/sched/sched_send.cpp	2009-01-15 21:23:20.000000000 +0100
++++ boinc-6.6.40/sched/sched_send.cpp	2009-09-30 12:23:19.165922065 +0200
+@@ -1443,9 +1443,9 @@
+     g_wreq->seconds_to_fill = clamp_req_sec(g_request->work_req_seconds);
+     g_wreq->cpu_req_secs = clamp_req_sec(g_request->cpu_req_secs);
+     g_wreq->cpu_req_instances = g_request->cpu_req_instances;
+-    if (coproc_cuda) {
+-        g_wreq->cuda_req_secs = clamp_req_sec(coproc_cuda->req_secs);
+-        g_wreq->cuda_req_instances = coproc_cuda->req_instances;
++    if (g_request->coproc_cuda) { 
++        g_wreq->cuda_req_secs = clamp_req_sec(g_request->coproc_cuda->req_secs); 
++        g_wreq->cuda_req_instances = g_request->coproc_cuda->req_instances; 
+     }
+     if (g_wreq->cpu_req_secs || g_wreq->cuda_req_secs) {
+         g_wreq->rsc_spec_request = true;
+--- boinc-6.6.40.orig/sched/server_types.cpp	2009-01-13 00:05:49.000000000 +0100
++++ boinc-6.6.40/sched/server_types.cpp	2009-09-30 12:23:57.220083086 +0200
+@@ -168,6 +168,7 @@
+     have_time_stats_log = false;
+     client_cap_plan_class = false;
+     sandbox = -1;
++    coproc_cuda = 0;
+ 
+     fgets(buf, sizeof(buf), fin);
+     if (!match_tag(buf, "<scheduler_request>")) return "no start tag";
+@@ -327,6 +328,7 @@
+         }
+         if (match_tag(buf, "coprocs")) {
+             coprocs.parse(fin);
++            coproc_cuda = (COPROC_CUDA*)coprocs.lookup("CUDA"); 
+             continue;
+         }
+         if (parse_bool(buf, "client_cap_plan_class", client_cap_plan_class)) continue;
+--- boinc-6.6.40.orig/sched/sched_plan.h	2008-08-06 20:36:30.000000000 +0200
++++ boinc-6.6.40/sched/sched_plan.h	2009-09-30 12:28:05.856453380 +0200
+@@ -18,4 +18,13 @@
+ #include "boinc_db.h"
+ #include "server_types.h"
+ 
+-extern bool app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&);
++// reasons for the planning function to reject a host
++	
++#define PLAN_REJECT_PREFS           1
++#define PLAN_REJECT_NO_COPROC       2
++#define PLAN_REJECT_COPROC_VERSION  3
++#define PLAN_REJECT_COPROC_MEM      4
++#define PLAN_REJECT_COPROC_SPEED    5
++#define PLAN_REJECT_UNKNOWN         6
++
++extern int app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&);
+--- boinc-6.6.40.orig/sched/server_types.h	2009-01-13 00:47:52.000000000 +0100
++++ boinc-6.6.40/sched/server_types.h	2009-09-30 12:26:01.010255672 +0200
+@@ -103,6 +103,8 @@
+ // Note: this is zeroed out in SCHEDULER_REPLY constructor
+ //
+ struct WORK_REQ {
++    bool anonymous_platform; 
++
+     // Flags used by old-style scheduling,
+     // while making multiple passes through the work array
+     bool infeasible_only;
+@@ -320,6 +322,7 @@
+     HOST host;      // request message is parsed into here.
+                     // does NOT contain the full host record.
+     COPROCS coprocs;
++    COPROC_CUDA* coproc_cuda;
+     std::vector<RESULT> results;
+         // completed results being reported
+     std::vector<MSG_FROM_HOST_DESC> msgs_from_host;