# ChangeLog for dev-lang/yap
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.14 2007/02/03 04:41:14 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.15 2007/02/03 22:08:06 keri Exp $
+
+ 03 Feb 2007; keri <keri@gentoo.org> -files/yap-5.0.1-analyst.patch,
+ -files/yap-5.0.1-configure.patch, -files/yap-5.0.1-doc.patch,
+ -files/yap-5.0.1-malloc.patch, -files/yap-5.0.1-rclause.patch,
+ -files/yap-5.0.1-tabling.patch, -files/yap-5.0.1-tkyap.patch,
+ -yap-5.0.1.ebuild:
+ Remove old -5.0.1 version.
03 Feb 2007; keri <keri@gentoo.org> +files/yap-5.1.1-jpl.patch,
yap-5.1.1.ebuild:
-AUX yap-5.0.1-analyst.patch 412 RMD160 9aef58ad8f5f1cfffabe7600ab078e292b28383d SHA1 ed12e99ae9b66ba481acef4302906d42d6485fc7 SHA256 c28cbb5d3adda71b4d131e891d5172af6e9b585bb0372b515adf5ac6cf567b16
-MD5 4cc7f866af938319e13f03ca11b77411 files/yap-5.0.1-analyst.patch 412
-RMD160 9aef58ad8f5f1cfffabe7600ab078e292b28383d files/yap-5.0.1-analyst.patch 412
-SHA256 c28cbb5d3adda71b4d131e891d5172af6e9b585bb0372b515adf5ac6cf567b16 files/yap-5.0.1-analyst.patch 412
-AUX yap-5.0.1-configure.patch 922 RMD160 fe6859b966b3642863c699266c77491d836ec369 SHA1 d5b06418101c72c8911fa3c156b6852491a711ee SHA256 9ace0e241c91c319d326c5659873bd0a32717b6ea9ba19468c7d2e0a5b7058d7
-MD5 3f6aa658740e8780e40f5a6a64a69248 files/yap-5.0.1-configure.patch 922
-RMD160 fe6859b966b3642863c699266c77491d836ec369 files/yap-5.0.1-configure.patch 922
-SHA256 9ace0e241c91c319d326c5659873bd0a32717b6ea9ba19468c7d2e0a5b7058d7 files/yap-5.0.1-configure.patch 922
-AUX yap-5.0.1-doc.patch 3542 RMD160 6a00c2b7ac32e863f7ed0cbddca3511122b76812 SHA1 3aacc3a16dec51596ea731f5855c615e26a26da3 SHA256 dde712c1b53c3b9fd7e94c7cd39c20acd7b5d131691771dd1367ee05d90e6539
-MD5 92edc56f8d97c3f75c08098f143ae861 files/yap-5.0.1-doc.patch 3542
-RMD160 6a00c2b7ac32e863f7ed0cbddca3511122b76812 files/yap-5.0.1-doc.patch 3542
-SHA256 dde712c1b53c3b9fd7e94c7cd39c20acd7b5d131691771dd1367ee05d90e6539 files/yap-5.0.1-doc.patch 3542
-AUX yap-5.0.1-malloc.patch 389 RMD160 910da28edea5c01d16f6537034d3ea2cc089a827 SHA1 55e2243b29056783dda50ff3c5debb1d5d8bd133 SHA256 1f24bceba8071f22f15ccabebc46f740f028e067222cc730e3476006c39224e7
-MD5 374e43a2a6b670daa490c572b72c9b90 files/yap-5.0.1-malloc.patch 389
-RMD160 910da28edea5c01d16f6537034d3ea2cc089a827 files/yap-5.0.1-malloc.patch 389
-SHA256 1f24bceba8071f22f15ccabebc46f740f028e067222cc730e3476006c39224e7 files/yap-5.0.1-malloc.patch 389
-AUX yap-5.0.1-rclause.patch 1135 RMD160 03d0e4b0b3123ee1e0a0e46426ff8665c2d78430 SHA1 84b27de087dba38681bf4e6584246ae6e873715b SHA256 a9d101a9b4876cf317fc5cd10bf9b4a6c49215ef1bfdfac6d48b95b8343db2ae
-MD5 b41184eccc041c256e7d4d79c60f9cf8 files/yap-5.0.1-rclause.patch 1135
-RMD160 03d0e4b0b3123ee1e0a0e46426ff8665c2d78430 files/yap-5.0.1-rclause.patch 1135
-SHA256 a9d101a9b4876cf317fc5cd10bf9b4a6c49215ef1bfdfac6d48b95b8343db2ae files/yap-5.0.1-rclause.patch 1135
-AUX yap-5.0.1-tabling.patch 3275 RMD160 9cf23d363e4bd7089caa66dfe84631163992b643 SHA1 acada73af649d4a77ece271d90ed41f876d5d37f SHA256 23fafd401aa9acdd53e7cb2a97b621905c0148eb1aec71ce6f734ecf947b1998
-MD5 388475ce3af032ad0778876940367053 files/yap-5.0.1-tabling.patch 3275
-RMD160 9cf23d363e4bd7089caa66dfe84631163992b643 files/yap-5.0.1-tabling.patch 3275
-SHA256 23fafd401aa9acdd53e7cb2a97b621905c0148eb1aec71ce6f734ecf947b1998 files/yap-5.0.1-tabling.patch 3275
-AUX yap-5.0.1-tkyap.patch 1259 RMD160 50258dab9de41224314582d2bfc67ba2376f9afc SHA1 3c94d2d8747ab43ba0efda8aae690c370c7eff59 SHA256 3178561085f2f515a12e1feba360d1e77ddf92ce9edacb709928b83a78df1c76
-MD5 20aa2c8490bfd72fcbc559bfee81ca55 files/yap-5.0.1-tkyap.patch 1259
-RMD160 50258dab9de41224314582d2bfc67ba2376f9afc files/yap-5.0.1-tkyap.patch 1259
-SHA256 3178561085f2f515a12e1feba360d1e77ddf92ce9edacb709928b83a78df1c76 files/yap-5.0.1-tkyap.patch 1259
AUX yap-5.1.1-SONAME.patch 449 RMD160 04ce74ec66c3bd1bbdd66384f811705b6bc68e9f SHA1 e025dac6d109524b91a0eb20836953d2fa88e8f9 SHA256 05fc8598d5d7db69b854b089b39e9c009e4cc7fd13145132d9df365ccc293e55
MD5 3922f1a159a584529e8027d6061efe7a files/yap-5.1.1-SONAME.patch 449
RMD160 04ce74ec66c3bd1bbdd66384f811705b6bc68e9f files/yap-5.1.1-SONAME.patch 449
MD5 284f66d723b6bc3f64adbe656b54c6b0 files/yap-5.1.1-tkyap.patch 695
RMD160 4be6c0e2c4552c73a007388cc513372e0fd6dc67 files/yap-5.1.1-tkyap.patch 695
SHA256 07c91548765f684aaacdaefcad50220e48c4d663b7a0a57afeb8d57e5dbd8004 files/yap-5.1.1-tkyap.patch 695
-DIST Yap-5.0.1.tar.gz 3260612 RMD160 5804b6b2ec8bea3956c6e42fc2eacff720fe6814 SHA1 c59847655be140d113a2684383ef21a17aa14085 SHA256 1556ccc148ce2d4add03e005d7d82ca096ff37f2807a9ed5bdee78f41c70df24
DIST Yap-5.1.1.tar.gz 3429186 RMD160 a32aec2f29e5964c302fa93fa54aa2d1dbe8defd SHA1 166c8c3199a43ae913572a3022674d821ac40b68 SHA256 cadb35cb3b7e469aa6bc6f7a819904f1f746b1e9c71f4a2af1ea254569ed522d
-EBUILD yap-5.0.1.ebuild 1926 RMD160 369a3eb6368b1665a7c1106b774675ca7bf8b119 SHA1 d2197feadf4b87a4008a7607dc06fc70931dd5cb SHA256 7ed9d6d1b4ac094366d78a0b4969fd2ed9f133bd1dd47b6a93548d47c086d837
-MD5 c04d3096e7ea6c31a6755021653ec85a yap-5.0.1.ebuild 1926
-RMD160 369a3eb6368b1665a7c1106b774675ca7bf8b119 yap-5.0.1.ebuild 1926
-SHA256 7ed9d6d1b4ac094366d78a0b4969fd2ed9f133bd1dd47b6a93548d47c086d837 yap-5.0.1.ebuild 1926
EBUILD yap-5.1.1.ebuild 2268 RMD160 a867afde266b4dea04f0d76ccfff4cf280e8783d SHA1 67a457baf17e7f4ead61f6d737be8f0b16e554c9 SHA256 f7646e14502ce1deba68a5cfeb024e18279150758aebc72d3a0b09cef10cc6ad
MD5 7368d61c9077d620fabd060f4ac9c410 yap-5.1.1.ebuild 2268
RMD160 a867afde266b4dea04f0d76ccfff4cf280e8783d yap-5.1.1.ebuild 2268
SHA256 f7646e14502ce1deba68a5cfeb024e18279150758aebc72d3a0b09cef10cc6ad yap-5.1.1.ebuild 2268
-MISC ChangeLog 2138 RMD160 398961f6d2f849b25d4944902400790f92cd3af8 SHA1 134c62689435970bb5dc2e0cb36e4e0464fbcb7b SHA256 6924fb0b9d62892206207c8a101aede39b45741a52dca31d382d8de3f4cbbb13
-MD5 30c8d892bea9ecfa6b2ddeca515e2cf1 ChangeLog 2138
-RMD160 398961f6d2f849b25d4944902400790f92cd3af8 ChangeLog 2138
-SHA256 6924fb0b9d62892206207c8a101aede39b45741a52dca31d382d8de3f4cbbb13 ChangeLog 2138
+MISC ChangeLog 2452 RMD160 5b5add1cf7e9dff7db2da80b23233974cc42ae04 SHA1 49b0d78f9fee2f1f209810d2508676000edbd525 SHA256 5ec628f6a5ead2d86e00e146823aaf6927eb58a822cb47d8c99124b891b8853b
+MD5 df4ea05a8ae6cf505e4a5878365c26e7 ChangeLog 2452
+RMD160 5b5add1cf7e9dff7db2da80b23233974cc42ae04 ChangeLog 2452
+SHA256 5ec628f6a5ead2d86e00e146823aaf6927eb58a822cb47d8c99124b891b8853b ChangeLog 2452
MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata.xml 159
-MD5 84cc267d1369b377ebc9d839910a7da2 files/digest-yap-5.0.1 232
-RMD160 f5fecf7dd7ad32b05daf768843aa4c6c728481cd files/digest-yap-5.0.1 232
-SHA256 376653f3a11c73a09aa1cef554d2bc60b36517378a442982f6e082ba9bf92856 files/digest-yap-5.0.1 232
MD5 b0b540f40f799d5ffa083e7ad192d780 files/digest-yap-5.1.1 232
RMD160 87a39e5d5151641fdfb130a3807ba1418e044ca5 files/digest-yap-5.1.1 232
SHA256 95b9fdecfe77131de6905b178604c3aacab6c5742396718554dc77ba6f4dbdf0 files/digest-yap-5.1.1 232
+++ /dev/null
-MD5 d8d1f1c5a38d501eb9db38d880668eda Yap-5.0.1.tar.gz 3260612
-RMD160 5804b6b2ec8bea3956c6e42fc2eacff720fe6814 Yap-5.0.1.tar.gz 3260612
-SHA256 1556ccc148ce2d4add03e005d7d82ca096ff37f2807a9ed5bdee78f41c70df24 Yap-5.0.1.tar.gz 3260612
+++ /dev/null
-diff -ur Yap-5.0.1.orig/H/Yap.h Yap-5.0.1/H/Yap.h
---- Yap-5.0.1.orig/H/Yap.h 2005-10-18 06:55:22.000000000 +1300
-+++ Yap-5.0.1/H/Yap.h 2006-02-21 21:22:18.000000000 +1300
-@@ -53,12 +53,6 @@
- #undef TRAILING_REQUIRES_BRANCH
- #endif /* YAPOR || TABLING */
-
--#if ANALYST
--#ifdef USE_THREADED_CODE
--#undef USE_THREADED_CODE
--#endif
--#endif
--
- #ifdef COROUTINING
- #ifndef TERM_EXTENSIONS
- #define TERM_EXTENSIONS 1
+++ /dev/null
---- Yap-5.0.1.orig/configure.in 2005-08-24 05:51:45.000000000 +1200
-+++ Yap-5.0.1/configure.in 2006-02-12 23:42:48.000000000 +1300
-@@ -53,7 +53,7 @@
- [ --enable-threads support system threads ],
- threads="$enableval", threads=no)
- AC_ARG_ENABLE(pthread-locking,
-- [ --pthread-locking use pthread locking primitives for internal locking (requires threads) ],
-+ [ --enable-pthread-locking use pthread locking primitives for internal locking (requires threads) ],
- pthreadlocking="$enableval", pthreadlocking=no)
- AC_ARG_ENABLE(max-performance,
- [ --enable-max-performance try using the best flags for specific architecture ],
-@@ -102,8 +102,6 @@
- [ --with-jpl=JAVA_HOME use Java instalation in JAVA_HOME],
- if test "$withval" = yes; then
- yap_cv_jpl="$JAVA_HOME"
-- dynamic_loading=yes
-- maxmemory=yes
- dnl threads=yes
- elif test "$withval" = no; then
- yap_cv_jpl=no
+++ /dev/null
---- Yap-5.0.1.orig/Makefile.in 2005-10-18 06:54:17.000000000 +1300
-+++ Yap-5.0.1/Makefile.in 2006-01-29 23:13:30.000000000 +1300
-@@ -526,6 +526,10 @@
- (cd CHR ; make install)
- (cd CLPBN ; make install)
-
-+install-doc:
-+ (cd CLPQR ; make install-doc)
-+ (cd CHR ; make install-doc)
-+
-
- ##########
- TAGS: $(C_SOURCES) $(PL_SOURCES) $(HEADERS)
---- Yap-5.0.1.orig/CHR/Makefile.in 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/CHR/Makefile.in 2006-01-29 22:51:39.000000000 +1300
-@@ -84,9 +84,11 @@
-
-
-
--install: $(CHR_TOP) $(CHR_LICENSE) $(CHR_PROGRAMS) $(CHR_EXAMPLES)
-- mkdir -p $(DESTDIR)$(SHAREDIR)/chr/examples
-+install: $(CHR_TOP) $(CHR_PROGRAMS)
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/chr
- for h in $(CHR_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-- for h in $(CHR_LICENSE); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
- for h in $(CHR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/chr; done
-+
-+install-doc: $(CHR_EXAMPLES)
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/chr/examples
- for h in $(CHR_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/chr/examples; done
---- Yap-5.0.1.orig/CLPBN/Makefile.in 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/CLPBN/Makefile.in 2006-01-29 22:35:10.000000000 +1300
-@@ -44,7 +44,6 @@
-
- install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_PROGRAMS)
- mkdir -p $(DESTDIR)$(SHAREDIR)/clpbn
-- mkdir -p $(DESTDIR)$(SHAREDIR)/clpbn/examples
- for h in $(CLPBN_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
- for h in $(CLPBN_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpbn; done
- # for h in $(CLPBN_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpbn/examples; done
---- Yap-5.0.1.orig/CLPQR/Makefile.in 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/CLPQR/Makefile.in 2006-01-29 22:43:04.000000000 +1300
-@@ -131,23 +131,22 @@
- $(srcdir)/clpqr/examples/SESSION/134 \
- $(srcdir)/clpqr/examples/SESSION/135
-
--install: $(CLPR_TOP) $(CLPQ_TOP) $(CLPQR_LICENSE) $(CLPQR_PROGRAMS) $(CLPQR_LOCAL)\
-- $(CLPQR_EXAMPLES) $(CLPQR_EXAMPLES_MONASH) $(CLPQR_EXAMPLES_SESSION)
-+install: $(CLPR_TOP) $(CLPQ_TOP) $(CLPQR_PROGRAMS) $(CLPQR_LOCAL)
- mkdir -p $(DESTDIR)$(SHAREDIR)/clpq
- mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr
- mkdir -p $(DESTDIR)$(SHAREDIR)/clpr
-- mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples
-- mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples/SESSION
-- mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples/monash
- for h in $(CLPQ_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
- for h in $(CLPR_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
-- for h in $(CLPQR_LICENSE); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
- for h in $(CLPQR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr; done
- for h in $(CLPQ_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpq; done
- for h in $(CLPR_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpr; done
- for h in $(CLPQR_LOCAL); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr; done
-+
-+install-doc: $(CLPQR_EXAMPLES) $(CLPQR_EXAMPLES_MONASH) $(CLPQR_EXAMPLES_SESSION)
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples/SESSION
-+ mkdir -p $(DESTDIR)$(SHAREDIR)/clpqr/examples/monash
- for h in $(CLPQR_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr/examples; done
- for h in $(CLPQR_EXAMPLES_MONASH); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr/examples/monash; done
- for h in $(CLPQR_EXAMPLES_SESSION); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpqr/examples/SESSION; done
-
--
+++ /dev/null
---- Yap-5.0.1.orig/C/exec.c 2005-10-18 04:21:54.000000000 +1300
-+++ Yap-5.0.1/C/exec.c 2006-02-23 22:32:20.000000000 +1300
-@@ -1362,7 +1362,7 @@
- READ_LOCK(ppe->PRWLock);
- CodeAdr = ppe->CodeOfPred;
- READ_UNLOCK(ppe->PRWLock);
--#if !USE_MALLOC
-+#if !USE_SYSTEM_MALLOC
- if (Yap_TrailTop - HeapTop < 2048) {
- Yap_PrologMode = BootMode;
- Yap_Error(OUT_OF_TRAIL_ERROR,TermNil,
+++ /dev/null
---- Yap-5.0.1/H/rclause.h 2005-08-22 23:09:14.000000000 +1200
-+++ cvs/yap/H/rclause.h 2006-02-18 23:21:36.000000000 +1300
-@@ -180,6 +187,7 @@
- case _retry3:
- case _retry4:
- case _p_eq:
-+ case _p_dif:
- pc->u.l.l = PtoOpAdjust(pc->u.l.l);
- pc = NEXTOP(pc,l);
- break;
-@@ -220,7 +228,6 @@
- case _undef_p:
- case _spy_pred:
- case _p_equal:
-- case _p_dif:
- case _p_functor:
- case _enter_a_profiling:
- case _count_a_call:
-@@ -773,10 +783,10 @@
- /* instructions type xllll */
- case _switch_list_nl:
- pc->u.ollll.pop = Yap_opcode(Yap_op_from_opcode(pc->u.ollll.pop));
-- pc->u.ollll.l1 = PtoOpAdjust(pc->u.llll.l1);
-- pc->u.ollll.l2 = PtoOpAdjust(pc->u.llll.l2);
-- pc->u.ollll.l3 = PtoOpAdjust(pc->u.llll.l3);
-- pc->u.ollll.l4 = PtoOpAdjust(pc->u.llll.l4);
-+ pc->u.ollll.l1 = PtoOpAdjust(pc->u.ollll.l1);
-+ pc->u.ollll.l2 = PtoOpAdjust(pc->u.ollll.l2);
-+ pc->u.ollll.l3 = PtoOpAdjust(pc->u.ollll.l3);
-+ pc->u.ollll.l4 = PtoOpAdjust(pc->u.ollll.l4);
- pc = NEXTOP(pc,ollll);
- break;
- /* instructions type xllll */
+++ /dev/null
---- Yap-5.0.1.orig/C/save.c 2005-08-25 00:21:48.000000000 +1200
-+++ Yap-5.0.1/C/save.c 2006-02-25 00:40:13.000000000 +1300
-@@ -463,7 +463,7 @@
- {
- int j;
- /* Then save the whole heap */
--#if defined(YAPOR) || defined(TABLING)
-+#if defined(YAPOR) || defined(TABLING) && !defined(YAP_MEMORY_ALLOC_SCHEME)
- /* skip the local and global data structures */
- j = Unsigned(&GLOBAL) - Unsigned(Yap_HeapBase);
- putout(j);
-@@ -871,7 +871,7 @@
- static int
- CopyCode(void)
- {
--#if defined(YAPOR) || defined(TABLING)
-+#if (defined(YAPOR) || defined(TABLING)) && !defined(YAP_MEMORY_ALLOC_SCHEME)
- /* skip the local and global data structures */
- CELL j = get_cell();
- if (Yap_ErrorMessage)
---- Yap-5.0.1.orig/OPTYap/opt.config.h 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/OPTYap/opt.config.h 2006-02-25 00:38:28.000000000 +1300
-@@ -26,8 +26,8 @@
- /* ----------------------------------------- **
- ** memory alloc scheme (define one) **
- ** ----------------------------------------- */
--#define SHM_MEMORY_ALLOC_SCHEME 1
--/* #define YAP_MEMORY_ALLOC_SCHEME 1 */
-+/* #define SHM_MEMORY_ALLOC_SCHEME 1 */
-+#define YAP_MEMORY_ALLOC_SCHEME 1
- /* #define MALLOC_MEMORY_ALLOC_SCHEME 1 */
-
- /* ------------------------------------------- **
---- Yap-5.0.1.orig/OPTYap/opt.init.c 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/OPTYap/opt.init.c 2006-02-24 22:46:00.000000000 +1300
-@@ -159,9 +159,11 @@
-
-
- void init_local(void) {
-+#if defined(YAPOR) || defined(THREADS)
-+ LOCAL = REMOTE + worker_id;
-+#endif
- #ifdef YAPOR
- /* local data related to or-parallelism */
-- LOCAL = REMOTE + worker_id;
- LOCAL_top_cp = B_BASE;
- LOCAL_top_or_fr = GLOBAL_root_or_fr;
- LOCAL_load = 0;
---- Yap-5.0.1.orig/OPTYap/opt.structs.h 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/OPTYap/opt.structs.h 2006-02-24 21:29:32.000000000 +1300
-@@ -41,7 +41,7 @@
- ** ---------------------- */
-
- struct pages {
--#ifdef YAPOR
-+#if defined(YAPOR) || defined(THREADS)
- lockvar lock;
- #endif /* YAPOR */
- volatile long pages_allocated;
-@@ -274,9 +274,11 @@
- ** --------------------------- */
-
- struct local_data{
-+#if defined(YAPOR) || defined(THREADS)
-+ lockvar lock;
-+#endif
- #ifdef YAPOR
- /* local data related to or-parallelism */
-- lockvar lock;
- volatile int load;
- choiceptr top_choice_point;
- struct or_frame *top_or_frame;
---- Yap-5.0.1.orig/OPTYap/tab.structs.h 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/OPTYap/tab.structs.h 2006-02-24 21:49:27.000000000 +1300
-@@ -50,7 +50,7 @@
- ** ---------------------------- */
-
- typedef struct table_entry {
--#ifdef YAPOR
-+#if defined(YAPOR) || defined(THREADS)
- lockvar lock;
- #endif /* YAPOR */
- struct pred_entry *pred_entry;
-@@ -149,8 +149,10 @@
- ** ------------------------------ */
-
- typedef struct subgoal_frame {
--#ifdef YAPOR
-+#if defined(YAPOR) || defined(THREADS)
- lockvar lock;
-+#endif
-+#ifdef YAPOR
- int generator_worker;
- struct or_frame *top_or_frame_on_generator_branch;
- #endif /* YAPOR */
-@@ -225,8 +227,10 @@
- ** --------------------------------- */
-
- typedef struct dependency_frame {
--#ifdef YAPOR
-+#if defined(YAPOR) || defined(THREADS)
- lockvar lock;
-+#endif
-+#ifdef YAPOR
- int leader_dependency_is_on_stack;
- struct or_frame *top_or_frame;
- #ifdef TIMESTAMP_CHECK
+++ /dev/null
---- Yap-5.0.1.orig/misc/tkyap 2005-08-22 23:09:14.000000000 +1200
-+++ Yap-5.0.1/misc/tkyap 2006-02-25 13:41:53.000000000 +1300
-@@ -30,19 +30,10 @@
- #option add "*message*Font" $TextFont
- #option add "*list*Font" $TextFont
-
--if {[file exists /vmlinuz]} {
-- set TextFont "*6x10*"
-- if {[file exists /home/luis/Yap94/linux]} {
-- set homeyap /home/luis/Yap94/linux
-- } else {
-- set homeyap .
-- }
-- set PrologCommand "$homeyap/yap $homeyap/startup -c localhost $service $YapOptions"
-- set SolarisBug 0
--} else {
-- set PrologCommand "ny -h8000 -s1000"
-- set SolarisBug 1
--}
-+set TextFont "*6x10*"
-+
-+set PrologCommand "yap -c localhost $service $YapOptions"
-+set SolarisBug 0
-
-
-
-@@ -122,7 +113,7 @@
- menubutton .menu.exec -text "Execution" -menu .menu.exec.m -underline 0
- menu .menu.exec.m
- .menu.exec.m add command -label "Interrupt" \
-- -command {global tcl_mode; set tcl_mode 0; exec kill SIGINT $pid}
-+ -command {global tcl_mode; set tcl_mode 0; exec kill -SIGINT $pid}
- .menu.exec.m add separator
- .menu.exec.m add command -label "Statistics" -command {YapStats}
-
-@@ -181,7 +172,7 @@
- bind .frame.text <Control-Key-c> {
- set tcl_mode 0
- .frame.text yview -pickplace end
-- exec kill SIGINT $pid
-+ exec kill -SIGINT $pid
- }
-
-
+++ /dev/null
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.0.1.ebuild,v 1.3 2006/09/17 02:02:00 keri Exp $
-
-inherit autotools eutils
-
-MY_P="Yap-${PV}"
-
-DESCRIPTION="YAP is a high-performance Prolog compiler."
-HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/"
-SRC_URI="http://www.ncc.up.pt/~vsc/Yap/current/${MY_P}.tar.gz"
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug doc gmp java mpi readline static tk threads"
-
-DEPEND="gmp? ( dev-libs/gmp )
- java? ( virtual/jdk )
- mpi? ( virtual/mpi )
- readline? ( sys-libs/readline )"
-
-RDEPEND="${DEPEND}
- tk? ( dev-lang/tk )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-configure.patch
- epatch "${FILESDIR}"/${P}-malloc.patch
- epatch "${FILESDIR}"/${P}-analyst.patch
- epatch "${FILESDIR}"/${P}-rclause.patch
- epatch "${FILESDIR}"/${P}-tabling.patch
- epatch "${FILESDIR}"/${P}-doc.patch
- epatch "${FILESDIR}"/${P}-tkyap.patch
-}
-
-src_compile() {
- eautoconf
- econf \
- --enable-low-level-tracer \
- --enable-rational-trees \
- --enable-coroutining \
- --enable-tabling \
- --disable-depth-limit \
- --disable-or-parallelism \
- $(use_enable threads) \
- $(use_enable threads pthread-locking) \
- $(use_enable threads use-malloc) \
- $(use_enable !static dynamic-loading) \
- $(use_enable debug debug-yap) \
- $(use_enable debug wam-profile) \
- $(use_with gmp) \
- $(use_with readline) \
- $(use_with mpi) \
- $(use_with mpi mpe) \
- $(use_with java jpl) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed."
-
- if use tk ; then
- exeinto /usr/bin
- doexe misc/tkyap
- fi
-
- if use doc ; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed."
- dodoc docs/yap.html
- fi
-
- doinfo docs/*.info*
- dodoc changes4.3.html INSTALL README
-}
projects / gentoo.git / commitdiff