* [gentoo-commits] gentoo-x86 commit in dev-lang/yap/files: yap-6.0.1-multilib.patch yap-6.0.1-bootfile.patch yap-6.0.1-dynamic-lib.patch yap-6.0.1-myddas-include.patch yap-6.0.1-yapsharedir.patch yap-6.0.1-mpi-include.patch
@ 2010-03-03 8:23 Keri Harris (keri)
0 siblings, 0 replies; only message in thread
From: Keri Harris (keri) @ 2010-03-03 8:23 UTC (permalink / raw
To: gentoo-commits
keri 10/03/03 08:23:04
Added: yap-6.0.1-multilib.patch yap-6.0.1-bootfile.patch
yap-6.0.1-dynamic-lib.patch
yap-6.0.1-myddas-include.patch
yap-6.0.1-yapsharedir.patch
yap-6.0.1-mpi-include.patch
Log:
Version bump
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-lang/yap/files/yap-6.0.1-multilib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-multilib.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.1-multilib.patch
===================================================================
diff -ur yap-6.0.1.orig/CLPQR/Makefile.in yap-6.0.1/CLPQR/Makefile.in
--- yap-6.0.1.orig/CLPQR/Makefile.in 2010-03-01 21:59:16.000000000 +1300
+++ yap-6.0.1/CLPQR/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/GPL/Makefile.in yap-6.0.1/GPL/Makefile.in
--- yap-6.0.1.orig/GPL/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/GPL/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/LGPL/Makefile.in yap-6.0.1/LGPL/Makefile.in
--- yap-6.0.1.orig/LGPL/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/LGPL/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/LGPL/clp/Makefile.in yap-6.0.1/LGPL/clp/Makefile.in
--- yap-6.0.1.orig/LGPL/clp/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/LGPL/clp/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/LGPL/swi_console/Makefile.in yap-6.0.1/LGPL/swi_console/Makefile.in
--- yap-6.0.1.orig/LGPL/swi_console/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/LGPL/swi_console/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -8,7 +8,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/Makefile.in yap-6.0.1/Makefile.in
--- yap-6.0.1.orig/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -12,8 +12,8 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/library/Makefile.in yap-6.0.1/library/Makefile.in
--- yap-6.0.1.orig/library/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/library/lammpi/Makefile.in yap-6.0.1/library/lammpi/Makefile.in
--- yap-6.0.1.orig/library/lammpi/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/lammpi/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -17,7 +17,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/matlab/Makefile.in yap-6.0.1/library/matlab/Makefile.in
--- yap-6.0.1.orig/library/matlab/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/matlab/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/matrices/Makefile.in yap-6.0.1/library/matrices/Makefile.in
--- yap-6.0.1.orig/library/matrices/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/matrices/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/matrix/Makefile.in yap-6.0.1/library/matrix/Makefile.in
--- yap-6.0.1.orig/library/matrix/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/matrix/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/mpi/Makefile.in yap-6.0.1/library/mpi/Makefile.in
--- yap-6.0.1.orig/library/mpi/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/mpi/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -21,8 +21,8 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/library/random/Makefile.in yap-6.0.1/library/random/Makefile.in
--- yap-6.0.1.orig/library/random/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/random/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/regex/Makefile.in yap-6.0.1/library/regex/Makefile.in
--- yap-6.0.1.orig/library/regex/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/regex/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/rltree/Makefile.in yap-6.0.1/library/rltree/Makefile.in
--- yap-6.0.1.orig/library/rltree/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/rltree/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -17,7 +17,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/system/Makefile.in yap-6.0.1/library/system/Makefile.in
--- yap-6.0.1.orig/library/system/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/system/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/tries/Makefile.in yap-6.0.1/library/tries/Makefile.in
--- yap-6.0.1.orig/library/tries/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/tries/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/library/yap2swi/Makefile.in yap-6.0.1/library/yap2swi/Makefile.in
--- yap-6.0.1.orig/library/yap2swi/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/yap2swi/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/packages/CLPBN/Makefile.in yap-6.0.1/packages/CLPBN/Makefile.in
--- yap-6.0.1.orig/packages/CLPBN/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/CLPBN/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/packages/PLStream/Makefile.in yap-6.0.1/packages/PLStream/Makefile.in
--- yap-6.0.1.orig/packages/PLStream/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/PLStream/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -14,7 +14,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/packages/ProbLog/Makefile.in yap-6.0.1/packages/ProbLog/Makefile.in
--- yap-6.0.1.orig/packages/ProbLog/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/ProbLog/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/packages/ProbLog/simplecudd/Makefile.in yap-6.0.1/packages/ProbLog/simplecudd/Makefile.in
--- yap-6.0.1.orig/packages/ProbLog/simplecudd/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/ProbLog/simplecudd/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -13,7 +13,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/packages/chr/Makefile.in yap-6.0.1/packages/chr/Makefile.in
--- yap-6.0.1.orig/packages/chr/Makefile.in 2010-03-01 21:59:37.000000000 +1300
+++ yap-6.0.1/packages/chr/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -15,8 +15,8 @@
srcdir=@srcdir@
BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
SHAREDIR=$(ROOTDIR)/share/Yap
SHELL=@SHELL@
diff -ur yap-6.0.1.orig/packages/clpqr/Makefile.in yap-6.0.1/packages/clpqr/Makefile.in
--- yap-6.0.1.orig/packages/clpqr/Makefile.in 2010-03-01 21:59:38.000000000 +1300
+++ yap-6.0.1/packages/clpqr/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -18,8 +18,8 @@
ROOTDIR = $(prefix)
EROOTDIR = @exec_prefix@
BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
SHAREDIR=$(ROOTDIR)/share/Yap
CLPDIR=$(SHAREDIR)
else
diff -ur yap-6.0.1.orig/packages/cplint/Makefile.in yap-6.0.1/packages/cplint/Makefile.in
--- yap-6.0.1.orig/packages/cplint/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/cplint/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -12,7 +12,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
diff -ur yap-6.0.1.orig/packages/jpl/Makefile.in yap-6.0.1/packages/jpl/Makefile.in
--- yap-6.0.1.orig/packages/jpl/Makefile.in 2010-03-01 21:59:39.000000000 +1300
+++ yap-6.0.1/packages/jpl/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -22,8 +22,8 @@
srcdir=@srcdir@
BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
SHAREDIR=$(ROOTDIR)/share/Yap
SHLIB_CFLAGS=@SHLIB_CFLAGS@
diff -ur yap-6.0.1.orig/packages/plunit/Makefile.in yap-6.0.1/packages/plunit/Makefile.in
--- yap-6.0.1.orig/packages/plunit/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/plunit/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -17,9 +17,9 @@
srcdir=@srcdir@
BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
+LIBDIR=@libdir@
SHAREDIR=$(EROOTDIR)/share/Yap
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+YAPLIBDIR=@libdir@/Yap
PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
LN_S=@LN_S@
diff -ur yap-6.0.1.orig/packages/sgml/Makefile.in yap-6.0.1/packages/sgml/Makefile.in
--- yap-6.0.1.orig/packages/sgml/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/sgml/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -16,8 +16,8 @@
srcdir=@srcdir@
BINDIR = $(EROOTDIR)/bin
-LIBDIR=$(EROOTDIR)/lib
-YAPLIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@
+YAPLIBDIR=@libdir@/Yap
SHAREDIR=$(ROOTDIR)/share/Yap
SHELL=@SHELL@
diff -ur yap-6.0.1.orig/packages/swi-minisat2/C/Makefile.in yap-6.0.1/packages/swi-minisat2/C/Makefile.in
--- yap-6.0.1.orig/packages/swi-minisat2/C/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/swi-minisat2/C/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -14,7 +14,7 @@
#
# where YAP should look for libraries
#
-LIBDIR=$(EROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
#
CC=@CC@
diff -ur yap-6.0.1.orig/packages/swi-minisat2/Makefile.in yap-6.0.1/packages/swi-minisat2/Makefile.in
--- yap-6.0.1.orig/packages/swi-minisat2/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/packages/swi-minisat2/Makefile.in 2010-03-03 19:58:06.000000000 +1300
@@ -9,7 +9,7 @@
#
# where YAP should look for binary libraries
#
-LIBDIR=$(ROOTDIR)/lib/Yap
+LIBDIR=@libdir@/Yap
#
# where YAP should look for architecture-independent Prolog libraries
#
1.1 dev-lang/yap/files/yap-6.0.1-bootfile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-bootfile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-bootfile.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.1-bootfile.patch
===================================================================
--- yap-6.0.1.orig/C/c_interface.c 2010-03-01 21:59:16.000000000 +1300
+++ yap-6.0.1/C/c_interface.c 2010-03-03 21:10:11.000000000 +1300
@@ -2170,6 +2170,7 @@
static int eof_found = FALSE;
static int yap_lineno = 0;
+static char *BootFileDir = NULL;
static FILE *bootfile;
static char InitFile[] = "init.yap";
@@ -2489,11 +2490,21 @@
/* read the bootfile */
if (!do_bootstrap) {
+ BootFileDir = getenv("YAPBOOTDIR");
+ if (BootFileDir) {
#if HAVE_STRNCAT
- strncpy(boot_file, YAP_PL_SRCDIR, 256);
+ strncpy(boot_file, BootFileDir, 256);
#else
- strcpy(boot_file, YAP_PL_SRCDIR);
+ strcpy(boot_file, BootFileDir);
#endif
+ }
+ else {
+#if HAVE_STRNCAT
+ strncpy(boot_file, YAP_PL_SRCDIR, 256);
+#else
+ strcpy(boot_file, YAP_PL_SRCDIR);
+#endif
+ }
#if HAVE_STRNCAT
strncat(boot_file, "/", 255);
#else
@@ -2513,11 +2524,20 @@
Atom atfile;
Functor fgoal;
YAP_Term goal, as[2];
+ if (BootFileDir) {
#if HAVE_STRNCAT
- strncpy(init_file, YAP_PL_SRCDIR, 256);
+ strncpy(init_file, BootFileDir, 256);
#else
- strcpy(init_file, YAP_PL_SRCDIR);
+ strcpy(init_file, BootFileDir);
#endif
+ }
+ else {
+#if HAVE_STRNCAT
+ strncpy(init_file, YAP_PL_SRCDIR, 256);
+#else
+ strcpy(init_file, YAP_PL_SRCDIR);
+#endif
+ }
#if HAVE_STRNCAT
strncat(init_file, "/", 255);
#else
1.1 dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.1-dynamic-lib.patch
===================================================================
--- yap-6.0.1.orig/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/Makefile.in 2010-03-03 20:04:45.000000000 +1300
@@ -499,7 +499,7 @@
$(RANLIB) libYap.a
@DYNYAPLIB@: $(LIB_OBJECTS)
- @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS)
+ @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)
install: install_bin install_data
1.1 dev-lang/yap/files/yap-6.0.1-myddas-include.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-myddas-include.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-myddas-include.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.1-myddas-include.patch
===================================================================
--- yap-6.0.1.orig/Makefile.in 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/Makefile.in 2010-03-02 20:47:55.000000000 +1300
@@ -59,7 +59,7 @@
#
CC=@CC@
MPI_CC=@MPI_CC@
-CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS
+CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
1.1 dev-lang/yap/files/yap-6.0.1-yapsharedir.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.1-yapsharedir.patch
===================================================================
--- yap-6.0.1.orig/pl/consult.yap 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/pl/consult.yap 2010-03-03 19:13:57.000000000 +1300
@@ -853,12 +853,12 @@
atom_concat([Path,File],PFile).
'$system_library_directories'(Dir) :-
- getenv('YAPSHAREDIR', Dir).
+ getenv('YAPSHAREDIR', Dir), !.
'$system_library_directories'(Dir) :-
get_value(system_library_directory,Dir).
'$system_library_directories'(Dir) :-
- getenv('YAPCOMMONSDIR', Dir).
+ getenv('YAPCOMMONSDIR', Dir), !.
'$system_library_directories'(Dir) :-
get_value(prolog_commons_directory,Dir).
1.1 dev-lang/yap/files/yap-6.0.1-mpi-include.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-mpi-include.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-6.0.1-mpi-include.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.1-mpi-include.patch
===================================================================
--- yap-6.0.1.orig/library/mpi/mpi.c 2010-03-01 21:59:17.000000000 +1300
+++ yap-6.0.1/library/mpi/mpi.c 2010-03-02 20:57:43.000000000 +1300
@@ -26,9 +26,6 @@
#include "Yatom.h"
#include "yapio.h"
-/* for AtomEof */
-#include "Heap.h"
-
#include <stdlib.h>
#include <string.h>
#include <mpi.h>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-03 8:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-03 8:23 [gentoo-commits] gentoo-x86 commit in dev-lang/yap/files: yap-6.0.1-multilib.patch yap-6.0.1-bootfile.patch yap-6.0.1-dynamic-lib.patch yap-6.0.1-myddas-include.patch yap-6.0.1-yapsharedir.patch yap-6.0.1-mpi-include.patch Keri Harris (keri)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox