1 |
commit: bbde584218ddabc4661228d65f0e139ce1c7daba |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 30 14:17:18 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 30 14:17:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbde5842 |
7 |
|
8 |
dev-db/qdbm: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-db/qdbm/files/qdbm-perl.patch | 24 ++++++++++++---- |
13 |
dev-db/qdbm/files/qdbm-ruby19.patch | 56 +++++++++++++++++++++--------------- |
14 |
dev-db/qdbm/files/qdbm-runpath.patch | 24 ++++++---------- |
15 |
3 files changed, 60 insertions(+), 44 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/qdbm/files/qdbm-perl.patch b/dev-db/qdbm/files/qdbm-perl.patch |
18 |
index d46f9b3f236..1a7ca6a70dc 100644 |
19 |
--- a/dev-db/qdbm/files/qdbm-perl.patch |
20 |
+++ b/dev-db/qdbm/files/qdbm-perl.patch |
21 |
@@ -1,22 +1,34 @@ |
22 |
-diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in |
23 |
---- qdbm-1.8.62.orig/perl/Makefile.in |
24 |
-+++ qdbm-1.8.62/perl/Makefile.in |
25 |
+--- a/perl/Makefile.in |
26 |
++++ b/perl/Makefile.in |
27 |
+@@ -25,10 +25,10 @@ |
28 |
+ DESTDIR = |
29 |
+ |
30 |
+ # Building binaries |
31 |
+-CC = gcc |
32 |
++CC = @CC@ |
33 |
+ INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include |
34 |
+ OPTIMIZE = -O2 |
35 |
+-LD = gcc |
36 |
++LD = @CC@ |
37 |
+ LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@ |
38 |
+ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib |
39 |
+ |
40 |
@@ -42,15 +42,15 @@ |
41 |
all : |
42 |
cd depot && [ -f Makefile ] || \ |
43 |
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ |
44 |
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ |
45 |
-+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \ |
46 |
++ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \ |
47 |
$(RUNENV) make |
48 |
cd curia && [ -f Makefile ] || \ |
49 |
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ |
50 |
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ |
51 |
-+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \ |
52 |
++ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \ |
53 |
$(RUNENV) make |
54 |
cd villa && [ -f Makefile ] || \ |
55 |
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ |
56 |
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \ |
57 |
-+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \ |
58 |
++ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \ |
59 |
$(RUNENV) make |
60 |
@printf '\n' |
61 |
@printf '#================================================================\n' |
62 |
|
63 |
diff --git a/dev-db/qdbm/files/qdbm-ruby19.patch b/dev-db/qdbm/files/qdbm-ruby19.patch |
64 |
index 51c2800e74d..8724e7cdc4e 100644 |
65 |
--- a/dev-db/qdbm/files/qdbm-ruby19.patch |
66 |
+++ b/dev-db/qdbm/files/qdbm-ruby19.patch |
67 |
@@ -1,5 +1,5 @@ |
68 |
---- qdbm-1.8.78.orig/ruby/Makefile.in |
69 |
-+++ qdbm-1.8.78/ruby/Makefile.in |
70 |
+--- a/ruby/Makefile.in |
71 |
++++ b/ruby/Makefile.in |
72 |
@@ -85,27 +85,27 @@ |
73 |
sync ; sync |
74 |
cd depot && rm -rf casket |
75 |
@@ -37,17 +37,28 @@ |
76 |
cd villa && rm -rf casket |
77 |
@printf '\n' |
78 |
@printf '#================================================================\n' |
79 |
---- qdbm-1.8.78.orig/ruby/curia/mod_curia.c |
80 |
-+++ qdbm-1.8.78/ruby/curia/mod_curia.c |
81 |
+--- a/ruby/configure.in |
82 |
++++ b/ruby/configure.in |
83 |
+@@ -17,7 +17,7 @@ |
84 |
+ # Setting the default prefix |
85 |
+ if test "$prefix" = NONE |
86 |
+ then |
87 |
+- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'` |
88 |
++ prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'` |
89 |
+ fi |
90 |
+ |
91 |
+ # Duplication of QDBM for Ruby |
92 |
+--- a/ruby/curia/mod_curia.c |
93 |
++++ b/ruby/curia/mod_curia.c |
94 |
@@ -24,6 +24,13 @@ |
95 |
|
96 |
#define MAXOPEN 1024 |
97 |
|
98 |
+#ifndef StringValuePtr |
99 |
-+# define StringValuePtr(v) STR2CSTR(v) |
100 |
++# define StringValuePtr(v) STR2CSTR(v) |
101 |
+#endif |
102 |
+#ifndef RSTRING_LEN |
103 |
-+# define RSTRING_LEN(s) (RSTRING(s)->len) |
104 |
++# define RSTRING_LEN(s) (RSTRING(s)->len) |
105 |
+#endif |
106 |
+ |
107 |
|
108 |
@@ -110,8 +121,8 @@ |
109 |
curia = crtable[index]; |
110 |
if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){ |
111 |
if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1); |
112 |
---- qdbm-1.8.78.orig/ruby/curia/rbcrtest |
113 |
-+++ qdbm-1.8.78/ruby/curia/rbcrtest |
114 |
+--- a/ruby/curia/rbcrtest |
115 |
++++ b/ruby/curia/rbcrtest |
116 |
@@ -21,7 +21,7 @@ |
117 |
|
118 |
# main routine |
119 |
@@ -130,18 +141,17 @@ |
120 |
exit(main()) |
121 |
|
122 |
|
123 |
-Only in qdbm-1.8.78/ruby/depot: mkmf.log |
124 |
---- qdbm-1.8.78.orig/ruby/depot/mod_depot.c |
125 |
-+++ qdbm-1.8.78/ruby/depot/mod_depot.c |
126 |
+--- a/ruby/depot/mod_depot.c |
127 |
++++ b/ruby/depot/mod_depot.c |
128 |
@@ -23,6 +23,13 @@ |
129 |
|
130 |
#define MAXOPEN 1024 |
131 |
|
132 |
+#ifndef StringValuePtr |
133 |
-+# define StringValuePtr(v) STR2CSTR(v) |
134 |
++# define StringValuePtr(v) STR2CSTR(v) |
135 |
+#endif |
136 |
+#ifndef RSTRING_LEN |
137 |
-+# define RSTRING_LEN(s) (RSTRING(s)->len) |
138 |
++# define RSTRING_LEN(s) (RSTRING(s)->len) |
139 |
+#endif |
140 |
+ |
141 |
|
142 |
@@ -204,8 +214,8 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log |
143 |
depot = dptable[index]; |
144 |
if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){ |
145 |
if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1); |
146 |
---- qdbm-1.8.78.orig/ruby/depot/rbdptest |
147 |
-+++ qdbm-1.8.78/ruby/depot/rbdptest |
148 |
+--- a/ruby/depot/rbdptest |
149 |
++++ b/ruby/depot/rbdptest |
150 |
@@ -21,7 +21,7 @@ |
151 |
|
152 |
# main routine |
153 |
@@ -224,8 +234,8 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log |
154 |
exit(main()) |
155 |
|
156 |
|
157 |
---- qdbm-1.8.78.orig/ruby/myrbdoc |
158 |
-+++ qdbm-1.8.78/ruby/myrbdoc |
159 |
+--- a/ruby/myrbdoc |
160 |
++++ b/ruby/myrbdoc |
161 |
@@ -186,7 +186,7 @@ |
162 |
|
163 |
|
164 |
@@ -235,17 +245,17 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log |
165 |
exit(main()) |
166 |
|
167 |
|
168 |
---- qdbm-1.8.78.orig/ruby/villa/mod_villa.c |
169 |
-+++ qdbm-1.8.78/ruby/villa/mod_villa.c |
170 |
+--- a/ruby/villa/mod_villa.c |
171 |
++++ b/ruby/villa/mod_villa.c |
172 |
@@ -25,6 +25,13 @@ |
173 |
|
174 |
#define MAXOPEN 1024 |
175 |
|
176 |
+#ifndef StringValuePtr |
177 |
-+# define StringValuePtr(v) STR2CSTR(v) |
178 |
++# define StringValuePtr(v) STR2CSTR(v) |
179 |
+#endif |
180 |
+#ifndef RSTRING_LEN |
181 |
-+# define RSTRING_LEN(s) (RSTRING(s)->len) |
182 |
++# define RSTRING_LEN(s) (RSTRING(s)->len) |
183 |
+#endif |
184 |
+ |
185 |
|
186 |
@@ -341,8 +351,8 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log |
187 |
FIXNUM_P(vcpmode); |
188 |
cpmode = FIX2INT(vcpmode); |
189 |
villa = vltable[index]; |
190 |
---- qdbm-1.8.78.orig/ruby/villa/rbvltest |
191 |
-+++ qdbm-1.8.78/ruby/villa/rbvltest |
192 |
+--- a/ruby/villa/rbvltest |
193 |
++++ b/ruby/villa/rbvltest |
194 |
@@ -21,7 +21,7 @@ |
195 |
|
196 |
# main routine |
197 |
|
198 |
diff --git a/dev-db/qdbm/files/qdbm-runpath.patch b/dev-db/qdbm/files/qdbm-runpath.patch |
199 |
index 4fc1a1f7029..56d85a5b14a 100644 |
200 |
--- a/dev-db/qdbm/files/qdbm-runpath.patch |
201 |
+++ b/dev-db/qdbm/files/qdbm-runpath.patch |
202 |
@@ -1,36 +1,30 @@ |
203 |
-diff -ur qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in |
204 |
---- qdbm-1.8.77.orig/Makefile.in |
205 |
-+++ qdbm-1.8.77/Makefile.in |
206 |
-@@ -61,7 +61,7 @@ |
207 |
+--- a/Makefile.in |
208 |
++++ b/Makefile.in |
209 |
+@@ -61,7 +61,6 @@ |
210 |
LIBS = -lqdbm @LIBS@ |
211 |
LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ |
212 |
LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) |
213 |
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib |
214 |
-+LDENV = |
215 |
AR = @AR@ |
216 |
ARFLAGS = rcsv |
217 |
RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib |
218 |
-diff -urN qdbm-1.8.77.orig/cgi/Makefile.in qdbm-1.8.77/cgi/Makefile.in |
219 |
---- qdbm-1.8.77.orig/cgi/Makefile.in 2006-08-24 11:55:12.000000000 +0900 |
220 |
-+++ qdbm-1.8.77/cgi/Makefile.in 2007-12-15 22:02:43.804668256 +0900 |
221 |
-@@ -28,7 +28,7 @@ |
222 |
+--- a/cgi/Makefile.in |
223 |
++++ b/cgi/Makefile.in |
224 |
+@@ -28,7 +28,6 @@ |
225 |
CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2 |
226 |
LIBS = -lqdbm @LIBS@ |
227 |
LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS) |
228 |
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib |
229 |
-+LDENV = |
230 |
|
231 |
# Install destinations |
232 |
prefix = @prefix@ |
233 |
-diff -urN qdbm-1.8.77.orig/plus/Makefile.in qdbm-1.8.77/plus/Makefile.in |
234 |
---- qdbm-1.8.77.orig/plus/Makefile.in 2007-03-07 11:44:27.000000000 +0900 |
235 |
-+++ qdbm-1.8.77/plus/Makefile.in 2007-12-15 22:02:32.976636806 +0900 |
236 |
-@@ -51,7 +51,7 @@ |
237 |
+--- a/plus/Makefile.in |
238 |
++++ b/plus/Makefile.in |
239 |
+@@ -51,7 +51,6 @@ |
240 |
-L$(HOME)/lib -L/usr/local/lib $(LIBS) |
241 |
LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \ |
242 |
-L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS) |
243 |
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib |
244 |
-+LDENV = |
245 |
AR = @AR@ |
246 |
ARFLAGS = rcsv |
247 |
RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib |