diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-11-16 06:34:29 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-11-16 06:34:29 +0000 |
| commit | 80ee22d84a38d0683d7ea9a103ebb37cd598cc86 (patch) | |
| tree | 52a47c1b93429a41aa201e94548e79b7300a6e17 /dev-lang | |
| parent | Bump. (diff) | |
| download | gentoo-2-80ee22d84a38d0683d7ea9a103ebb37cd598cc86.tar.gz gentoo-2-80ee22d84a38d0683d7ea9a103ebb37cd598cc86.tar.bz2 gentoo-2-80ee22d84a38d0683d7ea9a103ebb37cd598cc86.zip | |
Disable PL_EV_THREADFINISHED event hook in single-threaded engine.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/swi-prolog/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch | 30 | ||||
| -rw-r--r-- | dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild | 3 |
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 872ded4daf30..0e804f8a52d0 100644 --- 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/files/swi-prolog-PL_EV_THREADFINISHED.patch b/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch new file mode 100644 index 000000000000..8c0ca90940b2 --- /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 8929c3d64097..7e8e2ec095d6 100644 --- 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 |