| 1 |
keri 07/12/10 08:13:44 |
| 2 |
|
| 3 |
Modified: yap-5.1.2-multilib.patch |
| 4 |
Log: |
| 5 |
Fix multilib patch. Closes #201754. |
| 6 |
(Portage version: 2.1.4_rc9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-lang/yap/files/yap-5.1.2-multilib.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-5.1.2-multilib.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-5.1.2-multilib.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/yap/files/yap-5.1.2-multilib.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: yap-5.1.2-multilib.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/yap/files/yap-5.1.2-multilib.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- yap-5.1.2-multilib.patch 21 Nov 2007 06:25:29 -0000 1.1 |
| 22 |
+++ yap-5.1.2-multilib.patch 10 Dec 2007 08:13:44 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
diff -ur Yap-5.1.2.orig/CLPBN/Makefile.in Yap-5.1.2/CLPBN/Makefile.in |
| 25 |
--- Yap-5.1.2.orig/CLPBN/Makefile.in 2006-02-12 13:41:23.000000000 +1300 |
| 26 |
-+++ Yap-5.1.2/CLPBN/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 27 |
++++ Yap-5.1.2/CLPBN/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 28 |
@@ -9,7 +9,7 @@ |
| 29 |
# |
| 30 |
# where YAP should look for libraries |
| 31 |
@@ -12,7 +12,7 @@ |
| 32 |
# |
| 33 |
diff -ur Yap-5.1.2.orig/LGPL/JPL/Makefile.in Yap-5.1.2/LGPL/JPL/Makefile.in |
| 34 |
--- Yap-5.1.2.orig/LGPL/JPL/Makefile.in 2005-03-12 17:04:58.000000000 +1300 |
| 35 |
-+++ Yap-5.1.2/LGPL/JPL/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 36 |
++++ Yap-5.1.2/LGPL/JPL/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 37 |
@@ -9,7 +9,7 @@ |
| 38 |
# |
| 39 |
# where YAP should look for binary libraries |
| 40 |
@@ -24,7 +24,7 @@ |
| 41 |
# |
| 42 |
diff -ur Yap-5.1.2.orig/LGPL/JPL/java/Makefile.in Yap-5.1.2/LGPL/JPL/java/Makefile.in |
| 43 |
--- Yap-5.1.2.orig/LGPL/JPL/java/Makefile.in 2006-03-22 10:28:08.000000000 +1200 |
| 44 |
-+++ Yap-5.1.2/LGPL/JPL/java/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 45 |
++++ Yap-5.1.2/LGPL/JPL/java/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 46 |
@@ -15,7 +15,7 @@ |
| 47 |
# |
| 48 |
# where YAP should look for binary libraries |
| 49 |
@@ -36,7 +36,7 @@ |
| 50 |
# |
| 51 |
diff -ur Yap-5.1.2.orig/LGPL/JPL/src/Makefile.in Yap-5.1.2/LGPL/JPL/src/Makefile.in |
| 52 |
--- Yap-5.1.2.orig/LGPL/JPL/src/Makefile.in 2006-05-25 13:02:03.000000000 +1200 |
| 53 |
-+++ Yap-5.1.2/LGPL/JPL/src/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 54 |
++++ Yap-5.1.2/LGPL/JPL/src/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 55 |
@@ -19,7 +19,7 @@ |
| 56 |
# |
| 57 |
# where YAP should look for libraries |
| 58 |
@@ -48,7 +48,7 @@ |
| 59 |
CC=@CC@ |
| 60 |
diff -ur Yap-5.1.2.orig/LGPL/clp/Makefile.in Yap-5.1.2/LGPL/clp/Makefile.in |
| 61 |
--- Yap-5.1.2.orig/LGPL/clp/Makefile.in 2005-10-28 15:43:57.000000000 +1300 |
| 62 |
-+++ Yap-5.1.2/LGPL/clp/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 63 |
++++ Yap-5.1.2/LGPL/clp/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 64 |
@@ -9,7 +9,7 @@ |
| 65 |
# |
| 66 |
# where YAP should look for binary libraries |
| 67 |
@@ -60,7 +60,7 @@ |
| 68 |
# |
| 69 |
diff -ur Yap-5.1.2.orig/Makefile.in Yap-5.1.2/Makefile.in |
| 70 |
--- Yap-5.1.2.orig/Makefile.in 2007-06-21 01:45:42.000000000 +1200 |
| 71 |
-+++ Yap-5.1.2/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 72 |
++++ Yap-5.1.2/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 73 |
@@ -4,7 +4,7 @@ |
| 74 |
# |
| 75 |
prefix = @prefix@ |
| 76 |
@@ -83,7 +83,7 @@ |
| 77 |
# |
| 78 |
diff -ur Yap-5.1.2.orig/library/Makefile.in Yap-5.1.2/library/Makefile.in |
| 79 |
--- Yap-5.1.2.orig/library/Makefile.in 2007-06-21 01:46:02.000000000 +1200 |
| 80 |
-+++ Yap-5.1.2/library/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 81 |
++++ Yap-5.1.2/library/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 82 |
@@ -9,7 +9,7 @@ |
| 83 |
# |
| 84 |
# where YAP should look for binary libraries |
| 85 |
@@ -95,7 +95,7 @@ |
| 86 |
# |
| 87 |
diff -ur Yap-5.1.2.orig/library/Tries/Makefile.in Yap-5.1.2/library/Tries/Makefile.in |
| 88 |
--- Yap-5.1.2.orig/library/Tries/Makefile.in 2004-12-15 06:00:33.000000000 +1300 |
| 89 |
-+++ Yap-5.1.2/library/Tries/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 90 |
++++ Yap-5.1.2/library/Tries/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 91 |
@@ -18,7 +18,7 @@ |
| 92 |
# |
| 93 |
# where YAP should look for libraries |
| 94 |
@@ -105,9 +105,45 @@ |
| 95 |
# |
| 96 |
# |
| 97 |
CC=@CC@ |
| 98 |
+diff -ur Yap-5.1.2.orig/library/lammpi/Makefile.in Yap-5.1.2/library/lammpi/Makefile.in |
| 99 |
+--- Yap-5.1.2.orig/library/lammpi/Makefile.in 2006-07-28 01:14:48.000000000 +1200 |
| 100 |
++++ Yap-5.1.2/library/lammpi/Makefile.in 2007-11-23 20:28:11.000000000 +1300 |
| 101 |
+@@ -16,7 +16,7 @@ |
| 102 |
+ # |
| 103 |
+ # where YAP should look for libraries |
| 104 |
+ # |
| 105 |
+-LIBDIR=$(EROOTDIR)/lib/Yap |
| 106 |
++LIBDIR=@libdir@/Yap |
| 107 |
+ # |
| 108 |
+ # |
| 109 |
+ CC=@CC@ |
| 110 |
+diff -ur Yap-5.1.2.orig/library/matlab/Makefile.in Yap-5.1.2/library/matlab/Makefile.in |
| 111 |
+--- Yap-5.1.2.orig/library/matlab/Makefile.in 2007-05-25 03:11:46.000000000 +1200 |
| 112 |
++++ Yap-5.1.2/library/matlab/Makefile.in 2007-11-23 20:28:44.000000000 +1300 |
| 113 |
+@@ -12,7 +12,7 @@ |
| 114 |
+ # |
| 115 |
+ # where YAP should look for libraries |
| 116 |
+ # |
| 117 |
+-LIBDIR=$(EROOTDIR)/lib/Yap |
| 118 |
++LIBDIR=@libdir@/Yap |
| 119 |
+ # |
| 120 |
+ # |
| 121 |
+ CC=@CC@ |
| 122 |
+diff -ur Yap-5.1.2.orig/library/matrix/Makefile.in Yap-5.1.2/library/matrix/Makefile.in |
| 123 |
+--- Yap-5.1.2.orig/library/matrix/Makefile.in 2006-12-05 01:15:00.000000000 +1300 |
| 124 |
++++ Yap-5.1.2/library/matrix/Makefile.in 2007-11-23 20:27:39.000000000 +1300 |
| 125 |
+@@ -12,7 +12,7 @@ |
| 126 |
+ # |
| 127 |
+ # where YAP should look for libraries |
| 128 |
+ # |
| 129 |
+-LIBDIR=$(EROOTDIR)/lib/Yap |
| 130 |
++LIBDIR=@libdir@/Yap |
| 131 |
+ # |
| 132 |
+ # |
| 133 |
+ CC=@CC@ |
| 134 |
diff -ur Yap-5.1.2.orig/library/mpi/Makefile.in Yap-5.1.2/library/mpi/Makefile.in |
| 135 |
--- Yap-5.1.2.orig/library/mpi/Makefile.in 2004-12-15 06:00:33.000000000 +1300 |
| 136 |
-+++ Yap-5.1.2/library/mpi/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 137 |
++++ Yap-5.1.2/library/mpi/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 138 |
@@ -20,8 +20,8 @@ |
| 139 |
# |
| 140 |
# where YAP should look for binary libraries |
| 141 |
@@ -121,7 +157,7 @@ |
| 142 |
# |
| 143 |
diff -ur Yap-5.1.2.orig/library/random/Makefile.in Yap-5.1.2/library/random/Makefile.in |
| 144 |
--- Yap-5.1.2.orig/library/random/Makefile.in 2004-12-15 06:00:33.000000000 +1300 |
| 145 |
-+++ Yap-5.1.2/library/random/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 146 |
++++ Yap-5.1.2/library/random/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 147 |
@@ -12,7 +12,7 @@ |
| 148 |
# |
| 149 |
# where YAP should look for libraries |
| 150 |
@@ -133,7 +169,7 @@ |
| 151 |
CC=@CC@ |
| 152 |
diff -ur Yap-5.1.2.orig/library/regex/Makefile.in Yap-5.1.2/library/regex/Makefile.in |
| 153 |
--- Yap-5.1.2.orig/library/regex/Makefile.in 2004-12-15 06:00:33.000000000 +1300 |
| 154 |
-+++ Yap-5.1.2/library/regex/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 155 |
++++ Yap-5.1.2/library/regex/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 156 |
@@ -12,7 +12,7 @@ |
| 157 |
# |
| 158 |
# where YAP should look for libraries |
| 159 |
@@ -145,7 +181,19 @@ |
| 160 |
CC=@CC@ |
| 161 |
diff -ur Yap-5.1.2.orig/library/system/Makefile.in Yap-5.1.2/library/system/Makefile.in |
| 162 |
--- Yap-5.1.2.orig/library/system/Makefile.in 2004-12-15 06:00:33.000000000 +1300 |
| 163 |
-+++ Yap-5.1.2/library/system/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 164 |
++++ Yap-5.1.2/library/system/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 165 |
+@@ -12,7 +12,7 @@ |
| 166 |
+ # |
| 167 |
+ # where YAP should look for libraries |
| 168 |
+ # |
| 169 |
+-LIBDIR=$(EROOTDIR)/lib/Yap |
| 170 |
++LIBDIR=@libdir@/Yap |
| 171 |
+ # |
| 172 |
+ # |
| 173 |
+ CC=@CC@ |
| 174 |
+diff -ur Yap-5.1.2.orig/library/tries/Makefile.in Yap-5.1.2/library/tries/Makefile.in |
| 175 |
+--- Yap-5.1.2.orig/library/tries/Makefile.in 2007-05-03 03:31:23.000000000 +1200 |
| 176 |
++++ Yap-5.1.2/library/tries/Makefile.in 2007-11-23 20:32:20.000000000 +1300 |
| 177 |
@@ -12,7 +12,7 @@ |
| 178 |
# |
| 179 |
# where YAP should look for libraries |
| 180 |
@@ -157,7 +205,7 @@ |
| 181 |
CC=@CC@ |
| 182 |
diff -ur Yap-5.1.2.orig/library/yap2swi/Makefile.in Yap-5.1.2/library/yap2swi/Makefile.in |
| 183 |
--- Yap-5.1.2.orig/library/yap2swi/Makefile.in 2004-12-15 06:00:33.000000000 +1300 |
| 184 |
-+++ Yap-5.1.2/library/yap2swi/Makefile.in 2007-08-20 20:24:58.000000000 +1200 |
| 185 |
++++ Yap-5.1.2/library/yap2swi/Makefile.in 2007-11-23 20:26:19.000000000 +1300 |
| 186 |
@@ -12,7 +12,7 @@ |
| 187 |
# |
| 188 |
# where YAP should look for libraries |
| 189 |
|
| 190 |
|
| 191 |
|
| 192 |
-- |
| 193 |
gentoo-commits@g.o mailing list |
Archives