Disable PL_EV_THREADFINISHED event hook in single-threaded engine.

Package-Manager: portage-2.1.2_rc1-r3

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 872ded4daf30d14e454e7dfbbfaddad4b5624fb0..0e804f8a52d018b5c8a9791745b2d41f5c46374c 100644 (file)
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.51 2006/11/15 07:01:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.52 2006/11/16 06:34:29 keri Exp $
+
+  16 Nov 2006; keri <keri@gentoo.org>
+  +files/swi-prolog-PL_EV_THREADFINISHED.patch, swi-prolog-5.6.23.ebuild:
+  Disable PL_EV_THREADFINISHED event hook in single-threaded engine. Reported
+  by Ferris McCormick <fmccor@gentoo.org> in #155242
 
   15 Nov 2006; keri <keri@gentoo.org> +files/swi-prolog-CFLAGS-r3.patch:
   Add missing patch file. Thanks to fmccor@gentoo.org in #155150.

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 387c12b7a11d0b66350f0a894a222aa6d1d2c080..bc9b095d813f41f14545043969ae79d608642d96 100644 (file)
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -30,6 +30,10 @@ AUX swi-prolog-PLBASE-r2.patch 2920 RMD160 40ea3c1e611a75c3821c7f23736197fa2451b
 MD5 fe9375dc9822272821a01e00d7d6a562 files/swi-prolog-PLBASE-r2.patch 2920
 RMD160 40ea3c1e611a75c3821c7f23736197fa2451b2ed files/swi-prolog-PLBASE-r2.patch 2920
 SHA256 4c106febae1e98d2a7cffd13839dee3890f8c2b9c6d78ecd7468a5c4ee37a693 files/swi-prolog-PLBASE-r2.patch 2920
+AUX swi-prolog-PL_EV_THREADFINISHED.patch 939 RMD160 97f8e356045484a42b397541409954a8d823360a SHA1 1d67da078a749dcd900b93c52df0109e9fd38bea SHA256 b67514db76945a1e72c25a93163062c9a7c95d725d990498e559a60c79f803a1
+MD5 babb083d38f3bf9773f574dec7023887 files/swi-prolog-PL_EV_THREADFINISHED.patch 939
+RMD160 97f8e356045484a42b397541409954a8d823360a files/swi-prolog-PL_EV_THREADFINISHED.patch 939
+SHA256 b67514db76945a1e72c25a93163062c9a7c95d725d990498e559a60c79f803a1 files/swi-prolog-PL_EV_THREADFINISHED.patch 939
 AUX swi-prolog-SGML_CATALOG_FILES.patch 2737 RMD160 c6d21be37fce59e96f53df75d545ffe76259f4e3 SHA1 e802aa9dd2b44d81dd8cc87c6e77ffa8d855c938 SHA256 f2a5060301dc70fb1ba49498a047e99e4beebe9cdc7d67a9ce8f1dbd9f505aba
 MD5 0aeafc6b2fe48baa70fd66135472894b files/swi-prolog-SGML_CATALOG_FILES.patch 2737
 RMD160 c6d21be37fce59e96f53df75d545ffe76259f4e3 files/swi-prolog-SGML_CATALOG_FILES.patch 2737
@@ -149,14 +153,14 @@ EBUILD swi-prolog-5.6.22.ebuild 3318 RMD160 f9252e1e6c8167d6eb849c627a27bcb387cb
 MD5 c36b7f5cd6f40e8cfd041a17d4c8a23c swi-prolog-5.6.22.ebuild 3318
 RMD160 f9252e1e6c8167d6eb849c627a27bcb387cb39b3 swi-prolog-5.6.22.ebuild 3318
 SHA256 6d0946f800616b1050bb794a709522b3909bf40d32ff83711a6e323b80cb1805 swi-prolog-5.6.22.ebuild 3318
-EBUILD swi-prolog-5.6.23.ebuild 3360 RMD160 f43eccc97bcb82c1733ac82b3f00edc0cbfbc69d SHA1 0e6949414ebbcaded66b220455d4a4bc65d6abfd SHA256 2650f7044558eeea71962fb52e2b12220d6605b95b0abb788b5770daa7d31eea
-MD5 ae74fa01053eb293dd714337fc78ac5c swi-prolog-5.6.23.ebuild 3360
-RMD160 f43eccc97bcb82c1733ac82b3f00edc0cbfbc69d swi-prolog-5.6.23.ebuild 3360
-SHA256 2650f7044558eeea71962fb52e2b12220d6605b95b0abb788b5770daa7d31eea swi-prolog-5.6.23.ebuild 3360
-MISC ChangeLog 10056 RMD160 81febf3e0f5c23735cde57e0bc8f1b40fc30471b SHA1 d52cec20d973f02f01c803cb0c804fe3bb27d3cc SHA256 94863fb0bf30afe05eb29552508a2234c7b56fce73af646e70dc17accb27b4ca
-MD5 033ce5205d70f9cc3d0e1be38e3e86f8 ChangeLog 10056
-RMD160 81febf3e0f5c23735cde57e0bc8f1b40fc30471b ChangeLog 10056
-SHA256 94863fb0bf30afe05eb29552508a2234c7b56fce73af646e70dc17accb27b4ca ChangeLog 10056
+EBUILD swi-prolog-5.6.23.ebuild 3415 RMD160 ac82fc676f59a6abb13bfb0b55b3e210d93a7d19 SHA1 de6409a266de928961ff56c1a5bac1eceb8921b3 SHA256 396859850682fd79efbc25df982145e8dab1a78b45dfa3ca8769d2b48518ca70
+MD5 2bbfd236d2bc7b9cf71fcf6dea6befd3 swi-prolog-5.6.23.ebuild 3415
+RMD160 ac82fc676f59a6abb13bfb0b55b3e210d93a7d19 swi-prolog-5.6.23.ebuild 3415
+SHA256 396859850682fd79efbc25df982145e8dab1a78b45dfa3ca8769d2b48518ca70 swi-prolog-5.6.23.ebuild 3415
+MISC ChangeLog 10300 RMD160 a28d511160905f6d46c47ebd36f7c6d71c999ad7 SHA1 15c07020beee66ad2d8ab8e01a885a273a342da3 SHA256 6814d034b3cac0f582c7199397a69cc485a9baf9837d3e3d4048d92f2a71c771
+MD5 a5bc0d8ac57ac4c5f23d3a875274ba76 ChangeLog 10300
+RMD160 a28d511160905f6d46c47ebd36f7c6d71c999ad7 ChangeLog 10300
+SHA256 6814d034b3cac0f582c7199397a69cc485a9baf9837d3e3d4048d92f2a71c771 ChangeLog 10300
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159

diff --git a/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch b/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch
new file mode 100644 (file)
index 0000000..8c0ca90
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch
@@ -0,0 +1,30 @@
+--- pl-5.6.23.orig/src/pl-funcs.h      2006-11-02 03:27:21.000000000 +1300
++++ pl-5.6.23/src/pl-funcs.h   2006-11-16 07:14:02.000000000 +1300
+@@ -919,7 +919,9 @@
+ /* pl-thread.c */
+ COMMON(foreign_t)     pl_with_mutex(term_t mutex, term_t goal);
+ COMMON(foreign_t)     pl_thread_self(term_t self);
++#ifdef O_PLMT
+ COMMON(int)           unify_thread_id(term_t id, PL_thread_info_t *info);
++#endif
+ COMMON(int)           enableThreads(int enable);
+ 
+ 
+--- pl-5.6.23.orig/src/pl-trace.c      2006-11-03 02:41:12.000000000 +1300
++++ pl-5.6.23/src/pl-trace.c   2006-11-16 07:15:50.000000000 +1300
+@@ -1817,6 +1817,7 @@
+                          PL_TERM, ref);
+       break;
+       }
++#ifdef O_PLMT
+       case PL_EV_THREADFINISHED:
+       { PL_thread_info_t *info = va_arg(args, PL_thread_info_t*);
+       term_t id = PL_new_term_ref();
+@@ -1826,6 +1827,7 @@
+                            PL_TERM, id);
+       break;
+       }
++#endif
+       default:
+       warning("callEventHook(): unknown event: %d", ev);
+         goto out;

diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild
index 8929c3d64097029b49dc101891f1b6b910a6be0d..7e8e2ec095d648d5af832ff30312c57511247408 100644 (file)
--- a/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild,v 1.1 2006/11/10 21:06:14 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild,v 1.2 2006/11/16 06:34:29 keri Exp $
 
 inherit eutils
 
@@ -41,6 +41,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-portage-r1.patch
        epatch "${FILESDIR}"/${PN}-CFLAGS-r3.patch
        epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
+       epatch "${FILESDIR}"/${PN}-PL_EV_THREADFINISHED.patch
        epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
        epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
        epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch